June 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Add osx.patch to Instantbird config
by sukhbir＠torproject.org 29 Jun '15

29 Jun '15

commit eb28118dc093321b2f7f9791d0703662daecaa0e Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 29 07:56:23 2015 -0400 Add osx.patch to Instantbird config --- projects/instantbird/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 1608248..0565840 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -100,6 +100,7 @@ input_files: - filename: branding/default.ico - filename: branding/instantbird.ico - filename: branding/name.patch + - filename: branding/osx.patch - filename: branding/instantbird.icns - filename: branding/credits.patch - filename: branding/about.png

1 0

[tor-messenger-build/master] Set MOZ_APP_DISPLAYNAME for OS X
by sukhbir＠torproject.org 29 Jun '15

29 Jun '15

commit 6f482502f70d3ad64af6c7f63696e5b4fab7c3b5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 29 06:17:02 2015 -0400 Set MOZ_APP_DISPLAYNAME for OS X --- projects/instantbird/branding/osx.patch | 9 +++++++++ projects/tor-messenger/build.osx | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/projects/instantbird/branding/osx.patch b/projects/instantbird/branding/osx.patch new file mode 100644 index 0000000..196d671 --- /dev/null +++ b/projects/instantbird/branding/osx.patch @@ -0,0 +1,9 @@ +diff --git a/im/branding/messenger/configure.sh b/im/branding/messenger/configure.sh +--- a/im/branding/messenger/configure.sh ++++ b/im/branding/messenger/configure.sh +@@ -2,4 +2,4 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-MOZ_APP_DISPLAYNAME=Instantbird ++MOZ_APP_DISPLAYNAME="Tor Messenger" diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index ad85e78..5729c62 100644 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -2,7 +2,7 @@ set -e rootdir=$(pwd) tar xf [% c('input_files_by_name/instantbird') %] -mv Instantbird.app Tor\ Messenger.app +mv TorMessenger.app Tor\ Messenger.app tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH"

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 29 Jun '15

29 Jun '15

commit 0f6e3bc818ecd341e8611ad421b4905acdbe7e0c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 10:15:50 2015 +0000 Update translations for abouttor-homepage_completed --- hu/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd index 30bdaee..0535126 100644 --- a/hu/aboutTor.dtd +++ b/hu/aboutTor.dtd @@ -25,7 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "További infó:"> <!ENTITY aboutTor.torInfo2.label "Ország & IP cím:">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 29 Jun '15

29 Jun '15

commit f3b414ad037bf42bbbdde61e282c3bfca4ef7d2c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 10:15:45 2015 +0000 Update translations for abouttor-homepage --- hu/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd index bf25da3..0535126 100644 --- a/hu/aboutTor.dtd +++ b/hu/aboutTor.dtd @@ -25,7 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "További infó:"> <!ENTITY aboutTor.torInfo2.label "Ország & IP cím:">

1 0

[tor-browser-bundle/master] Revert "Bug 16351: Update our toolchain (Binutils/GCC)"
by gk＠torproject.org 29 Jun '15

29 Jun '15

commit a77485b5bab46e5947165afe05736035ba4012c9 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 29 08:56:12 2015 +0000 Revert "Bug 16351: Update our toolchain (Binutils/GCC)" This reverts commit 50e6d095bd8d8eaef460d0bddda9455ff222c685. --- gitian/descriptors/windows/gitian-utils.yml | 3 ++ gitian/patches/enable-reloc-section-ld.patch | 53 +++++++++++-------- gitian/patches/gcc-dev-random.patch | 72 ++++++++++++++++++++++++++ gitian/patches/peXXigen.patch | 27 +++++----- gitian/versions.alpha | 6 +-- gitian/versions.nightly | 6 +-- 6 files changed, 125 insertions(+), 42 deletions(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9162426..6e52c67 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -28,6 +28,7 @@ files: - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" +- "gcc-dev-random.patch" - "versions" - "dzip.sh" script: | @@ -74,6 +75,8 @@ script: | cd gcc tar -xjvf ../gcc.tar.bz2 cd gcc-* + # Don't use /dev/random on Windows. See bug 13169 for details. + patch -p1 < ../../gcc-dev-random.patch cd .. # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > ~/build/msvcr100.spec diff --git a/gitian/patches/enable-reloc-section-ld.patch b/gitian/patches/enable-reloc-section-ld.patch index 5845d75..f393f51 100644 --- a/gitian/patches/enable-reloc-section-ld.patch +++ b/gitian/patches/enable-reloc-section-ld.patch @@ -1,23 +1,30 @@ -From 99ffc3f28b964519892cb1fb8bdc64d42b80d777 Mon Sep 17 00:00:00 2001 +From 093b08a9e7af23a258306b710ebc4556d12f94f7 Mon Sep 17 00:00:00 2001 From: Erinn Clark <erinn(a)torproject.org> Date: Fri, 8 Aug 2014 14:23:44 -0400 Subject: [PATCH] add relocation section so Windows bundles can have ASLR Patch by skruffy. +--- + ld/emultempl/pe.em | 6 +++++ + ld/emultempl/pep.em | 8 ++++++- + ld/pe-dll.c | 63 ++++++++++++++++++++++++++++++----------------------- + ld/pe-dll.h | 1 + + 4 files changed, 50 insertions(+), 28 deletions(-) + diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 979cc8b..4a63863 100644 +index 5d6da9e..14c07f7 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -274,6 +274,7 @@ fragment <<EOF +@@ -268,6 +268,7 @@ fragment <<EOF + #define OPTION_TERMINAL_SERVER_AWARE (OPTION_WDM_DRIVER + 1) + /* Determinism. */ #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) - #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) - #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) ++#define OPTION_ENABLE_RELOC_SECTION (OPTION_INSERT_TIMESTAMP + 1) static void gld${EMULATION_NAME}_add_options -@@ -317,6 +318,7 @@ gld${EMULATION_NAME}_add_options +@@ -310,6 +311,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -25,7 +32,7 @@ index 979cc8b..4a63863 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -787,6 +789,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -773,6 +775,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pe_dll_exclude_all_symbols = 1; break; @@ -35,7 +42,7 @@ index 979cc8b..4a63863 100644 case OPTION_EXCLUDE_LIBS: pe_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -2059,6 +2064,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1839,6 +1844,7 @@ gld_${EMULATION_NAME}_finish (void) if (link_info.shared #if !defined(TARGET_IS_shpe) || (!link_info.relocatable && pe_def_file->num_exports != 0) @@ -44,20 +51,20 @@ index 979cc8b..4a63863 100644 ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b24a608..caf2946 100644 +index b738800..b566903 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -248,7 +248,8 @@ enum options +@@ -242,7 +242,8 @@ enum options + OPTION_NO_BIND, + OPTION_WDM_DRIVER, OPTION_INSERT_TIMESTAMP, - OPTION_NO_INSERT_TIMESTAMP, - OPTION_TERMINAL_SERVER_AWARE, -- OPTION_BUILD_ID -+ OPTION_BUILD_ID, +- OPTION_TERMINAL_SERVER_AWARE ++ OPTION_TERMINAL_SERVER_AWARE, + OPTION_ENABLE_RELOC_SECTION }; static void -@@ -290,6 +291,7 @@ gld${EMULATION_NAME}_add_options +@@ -284,6 +285,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -65,7 +72,7 @@ index b24a608..caf2946 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -743,6 +745,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -727,6 +729,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pep_dll_exclude_all_symbols = 1; break; @@ -75,7 +82,7 @@ index b24a608..caf2946 100644 case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1838,6 +1843,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1618,6 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) #ifdef DLL_SUPPORT if (link_info.shared @@ -84,10 +91,10 @@ index b24a608..caf2946 100644 { pep_dll_fill_sections (link_info.output_bfd, &link_info); diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index 61d8fa5..24c0c72 100644 +index e9e133b..4230dc3 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c -@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; +@@ -152,6 +152,7 @@ def_file * pe_def_file = 0; int pe_dll_export_everything = 0; int pe_dll_exclude_all_symbols = 0; int pe_dll_do_default_excludes = 1; @@ -193,10 +200,10 @@ index 61d8fa5..24c0c72 100644 bfd_boolean diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 24ea302..6a0d633 100644 +index 4697390..2bf71d9 100644 --- a/ld/pe-dll.h +++ b/ld/pe-dll.h -@@ -30,6 +30,7 @@ extern def_file *pe_def_file; +@@ -31,6 +31,7 @@ extern def_file *pe_def_file; extern int pe_dll_export_everything; extern int pe_dll_exclude_all_symbols; extern int pe_dll_do_default_excludes; @@ -205,5 +212,5 @@ index 24ea302..6a0d633 100644 extern int pe_dll_stdcall_aliases; extern int pe_dll_warn_dup_exports; -- -1.7.9.5 +2.0.1 diff --git a/gitian/patches/gcc-dev-random.patch b/gitian/patches/gcc-dev-random.patch new file mode 100644 index 0000000..9757f92 --- /dev/null +++ b/gitian/patches/gcc-dev-random.patch @@ -0,0 +1,72 @@ +From b0ce14899060267b5b5e4d7e3d91edcdf5c09514 Mon Sep 17 00:00:00 2001 +From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Tue, 10 Feb 2015 01:44:08 +0000 +Subject: [PATCH] * ssp.c (__guard_setup): For Windows, use approved methods + to get a suitable random number for the stack check guard + rather than reading /dev/random. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220559 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libssp/ChangeLog | 7 +++++++ + libssp/ssp.c | 16 ++++++++++++++++ + 2 files changed, 23 insertions(+) + +diff --git a/libssp/ChangeLog b/libssp/ChangeLog +index a445537..676d2a7 100644 +--- a/libssp/ChangeLog ++++ b/libssp/ChangeLog +@@ -1,3 +1,10 @@ ++2015-02-09 Georg Koppen <gk(a)torproject.org> ++ ++ * ssp.c: Conditionally include <windows.h> ++ (__guard_setup): For Windows, use approved methods to get ++ a suitable random number for the stack check guard rather ++ than reading /dev/random. ++ + 2014-07-16 Release Manager + + * GCC 4.9.1 released. +diff --git a/libssp/ssp.c b/libssp/ssp.c +index 96adf17..38e3ec8 100644 +--- a/libssp/ssp.c ++++ b/libssp/ssp.c +@@ -55,6 +55,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* Native win32 apps don't know about /dev/tty but can print directly + to the console using "CONOUT$" */ + #if defined (_WIN32) && !defined (__CYGWIN__) ++#include <windows.h> + # define _PATH_TTY "CONOUT$" + #else + # define _PATH_TTY "/dev/tty" +@@ -75,6 +76,20 @@ __guard_setup (void) + if (__stack_chk_guard != 0) + return; + ++#if defined (_WIN32) && !defined (__CYGWIN__) ++ HCRYPTPROV hprovider = 0; ++ if (CryptAcquireContext(&hprovider, NULL, NULL, PROV_RSA_FULL, ++ CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) ++ { ++ if (CryptGenRandom(hprovider, sizeof (__stack_chk_guard), ++ (BYTE *)&__stack_chk_guard) && __stack_chk_guard != 0) ++ { ++ CryptReleaseContext(hprovider, 0); ++ return; ++ } ++ CryptReleaseContext(hprovider, 0); ++ } ++#else + fd = open ("/dev/urandom", O_RDONLY); + if (fd != -1) + { +@@ -85,6 +100,7 @@ __guard_setup (void) + return; + } + ++#endif + /* If a random generator can't be used, the protector switches the guard + to the "terminator canary". */ + p = (unsigned char *) &__stack_chk_guard; +-- +1.7.10.4 + diff --git a/gitian/patches/peXXigen.patch b/gitian/patches/peXXigen.patch index 0ae0979..785aa02 100644 --- a/gitian/patches/peXXigen.patch +++ b/gitian/patches/peXXigen.patch @@ -1,13 +1,14 @@ -diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c -index 13e39e4..deef7b3 100644 ---- a/bfd/peXXigen.c -+++ b/bfd/peXXigen.c -@@ -873,6 +873,8 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out) - /* Only use a real timestamp if the option was chosen. */ - if ((pe_data (abfd)->insert_timestamp)) - H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); -+ else -+ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); +diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c +*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 +--- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 +*************** +*** 795,800 **** +--- 795,802 ---- + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3f94294..e7564d7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -39,8 +39,8 @@ OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 -BINUTILS_VER=2.25 -GCC_VER=5.1.0 +BINUTILS_VER=2.24 +GCC_VER=4.9.1 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -98,7 +98,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b -GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e613c6d..e2dc33b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -42,8 +42,8 @@ OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=38.0.1esr #$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 -BINUTILS_VER=2.25 -GCC_VER=5.1.0 +BINUTILS_VER=2.24 +GCC_VER=4.9.1 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -101,7 +101,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b -GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}

1 0

[tor-browser-bundle/master] Revert "Bug 16351: Use --no-insert-timestamp for linking"
by gk＠torproject.org 29 Jun '15

29 Jun '15

commit 8f35a0fc7a156dae5cfacae1606ead635de454cf Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 29 08:54:18 2015 +0000 Revert "Bug 16351: Use --no-insert-timestamp for linking" This reverts commit 1b5ae9017625081f251c71afb359bf9345c76b03. --- gitian/build-helpers/i686-w64-mingw32-g++ | 2 +- gitian/build-helpers/i686-w64-mingw32-gcc | 2 +- gitian/build-helpers/i686-w64-mingw32-ld | 2 +- gitian/descriptors/windows/gitian-pluggable-transports.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gitian/build-helpers/i686-w64-mingw32-g++ b/gitian/build-helpers/i686-w64-mingw32-g++ index 8975982..b73f107 100755 --- a/gitian/build-helpers/i686-w64-mingw32-g++ +++ b/gitian/build-helpers/i686-w64-mingw32-g++ @@ -1,4 +1,4 @@ #!/bin/sh # Hardened mingw gcc wrapper -/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" +/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" diff --git a/gitian/build-helpers/i686-w64-mingw32-gcc b/gitian/build-helpers/i686-w64-mingw32-gcc index a377c32..d4fd642 100755 --- a/gitian/build-helpers/i686-w64-mingw32-gcc +++ b/gitian/build-helpers/i686-w64-mingw32-gcc @@ -1,4 +1,4 @@ #!/bin/sh # Hardened mingw gcc wrapper -/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" +/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" diff --git a/gitian/build-helpers/i686-w64-mingw32-ld b/gitian/build-helpers/i686-w64-mingw32-ld index 84b5565..f8c61fd 100755 --- a/gitian/build-helpers/i686-w64-mingw32-ld +++ b/gitian/build-helpers/i686-w64-mingw32-ld @@ -1,4 +1,4 @@ #!/bin/sh # Hardened mingw gcc wrapper -/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section --no-insert-timestamp -lssp -L$INSTDIR/gcclibs/ "$@" +/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section -lssp -L$INSTDIR/gcclibs/ "$@" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 82fd266..1d8caba 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -83,7 +83,7 @@ script: | export TZ=UTC export LC_ALL=C export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" - export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs" + export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" umask 0022 unzip -d $INSTDIR mingw-w64-win32-utils.zip diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 650f7ad..9162426 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -82,7 +82,7 @@ script: | sed 's/msvcrt/msvcr100/' -i gcc-*/gcc/config/i386/t-mingw-w32 # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. - export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" + export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" gcc-*/configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ make $MAKEOPTS all-gcc make install-gcc @@ -120,11 +120,11 @@ script: | export FAKETIME=$REFERENCE_DATETIME # Building zlib export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" - export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs/" + export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" cd zlib find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs/" - make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs/" install + make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" + make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" install cd .. # Building Libevent @@ -141,7 +141,7 @@ script: | cd openssl-* find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. - ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl + ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl # Using $MAKEOPTS breaks the build. Might be the issue mentioned on # http://cblfs.cross-lfs.org/index.php/OpenSSL. make

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 29 Jun '15

29 Jun '15

commit 56422617464025e1f54090b49fbcba86bbfae65f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 08:46:15 2015 +0000 Update translations for tor-messenger-authdtd --- ru/auth.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/auth.dtd b/ru/auth.dtd index 23981b9..54e5902 100644 --- a/ru/auth.dtd +++ b/ru/auth.dtd @@ -7,15 +7,15 @@ <!ENTITY authDialog.verified "Я проверил что это фактически правильный отпечаток."> <!ENTITY authDialog.yourFingerprint "Ваш отпечаток"> <!ENTITY authDialog.theirFingerprint "Их предполагаемый отпечаток"> -<!ENTITY authDialog.manualVerification "Ручная проверка отпечатка"> +<!ENTITY authDialog.manualVerification "Проверка отпечатка вручную"> <!ENTITY authDialog.questionAndAnswer "Вопрос и ответ"> <!ENTITY authDialog.sharedSecret "Общий секрет"> <!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> <!ENTITY authDialog.choose "Выбрать"> -<!ENTITY authDialog.how "How would you like to verify your contact's identity?"> -<!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter."> -<!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> +<!ENTITY authDialog.how "Как вы хотите проверить личность контакта?"> +<!ENTITY authDialog.qaInstruction "Для проверки личности собеседника выберите вопрос, ответ на который известен только вам и вашему собеседнику. Введите этот вопрос и ответ на него, а затем дождитесь ответа собеседника. Если ваши ответы не совпадают, то возможно вы общаетесь с самозванцем."> +<!ENTITY authDialog.secretInstruction "Для проверки личности собеседника выберите какой-либо секрет, известный только вам и вашему собеседнику. Введите информацию об этом секрете и дождитесь, пока собеседник сделает то же самое. Если информация не совпадает, то возможно вы общаетесь с самозванцем."> <!ENTITY authDialog.question "Введите вопрос здесь:"> <!ENTITY authDialog.answer "Введите секретный ответ здесь (регистрозависимо):"> <!ENTITY authDialog.secret "Введите секрет здесь:"> -<!ENTITY authDialog.waiting "Ждем контакта..."> \ No newline at end of file +<!ENTITY authDialog.waiting "Ожидание ответа собеседника..."> \ No newline at end of file

1 0

[curriculum/master] Adding first round of new Tor Browser screenshots
by colin＠torproject.org 29 Jun '15

29 Jun '15

commit 4002ab2760bd255bc61923a90515a360cd4fb5f0 Author: Colin Childs <colin(a)torproject.org> Date: Wed Apr 15 20:05:23 2015 -0500 Adding first round of new Tor Browser screenshots --- shots/generic/browser.png | Bin 0 -> 80489 bytes shots/generic/privacy_slider.png | Bin 0 -> 26834 bytes shots/linux/linux_sig_verify.png | Bin 0 -> 62940 bytes shots/torbutton/torbutton_menu.png | Bin 0 -> 125787 bytes shots/torlauncher/torlauncher.png | Bin 0 -> 17807 bytes shots/torlauncher/torlauncher_bridges.png | Bin 0 -> 29850 bytes shots/torlauncher/torlauncher_ports.png | Bin 0 -> 20324 bytes shots/torlauncher/torlauncher_proxy.png | Bin 0 -> 24601 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/shots/generic/browser.png b/shots/generic/browser.png new file mode 100644 index 0000000..ca44aea Binary files /dev/null and b/shots/generic/browser.png differ diff --git a/shots/generic/privacy_slider.png b/shots/generic/privacy_slider.png new file mode 100644 index 0000000..16b7ac0 Binary files /dev/null and b/shots/generic/privacy_slider.png differ diff --git a/shots/linux/linux_sig_verify.png b/shots/linux/linux_sig_verify.png new file mode 100644 index 0000000..e0f1560 Binary files /dev/null and b/shots/linux/linux_sig_verify.png differ diff --git a/shots/torbutton/torbutton_menu.png b/shots/torbutton/torbutton_menu.png new file mode 100644 index 0000000..ba15c8f Binary files /dev/null and b/shots/torbutton/torbutton_menu.png differ diff --git a/shots/torlauncher/torlauncher.png b/shots/torlauncher/torlauncher.png new file mode 100644 index 0000000..0679e1c Binary files /dev/null and b/shots/torlauncher/torlauncher.png differ diff --git a/shots/torlauncher/torlauncher_bridges.png b/shots/torlauncher/torlauncher_bridges.png new file mode 100644 index 0000000..5d65921 Binary files /dev/null and b/shots/torlauncher/torlauncher_bridges.png differ diff --git a/shots/torlauncher/torlauncher_ports.png b/shots/torlauncher/torlauncher_ports.png new file mode 100644 index 0000000..69269db Binary files /dev/null and b/shots/torlauncher/torlauncher_ports.png differ diff --git a/shots/torlauncher/torlauncher_proxy.png b/shots/torlauncher/torlauncher_proxy.png new file mode 100644 index 0000000..5460f56 Binary files /dev/null and b/shots/torlauncher/torlauncher_proxy.png differ

1 0

[curriculum/master] Moving onion logo into /pictures/
by colin＠torproject.org 29 Jun '15

29 Jun '15

commit 8a0c9678fea2999ea1af23cf7cfd61e40d7a8255 Author: Colin Childs <colin(a)torproject.org> Date: Wed Apr 15 20:13:14 2015 -0500 Moving onion logo into /pictures/ --- module1/module1.tex | 2 +- module2/module2.tex | 2 +- module3/module3.tex | 2 +- module4/module4.tex | 2 +- onion.jpg | Bin 3911 -> 0 bytes pictures/onion.jpg | Bin 0 -> 3911 bytes 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module1/module1.tex b/module1/module1.tex index 54f196e..d2022b7 100644 --- a/module1/module1.tex +++ b/module1/module1.tex @@ -26,7 +26,7 @@ The Tor Project } -\logo{\includegraphics[height=1.5cm]{onion.jpg}} +\logo{\includegraphics[height=1.5cm]{pictures/onion.jpg}} \begin{document} \frame{\titlepage} diff --git a/module2/module2.tex b/module2/module2.tex index 950ec01..e880a81 100644 --- a/module2/module2.tex +++ b/module2/module2.tex @@ -21,7 +21,7 @@ The Tor Project } -\logo{\includegraphics[height=1.5cm]{onion.jpg}} +\logo{\includegraphics[height=1.5cm]{pictures/onion.jpg}} \begin{document} \frame{\titlepage} diff --git a/module3/module3.tex b/module3/module3.tex index 2fd0d41..39f004f 100644 --- a/module3/module3.tex +++ b/module3/module3.tex @@ -21,7 +21,7 @@ The Tor Project } -\logo{\includegraphics[height=1.5cm]{onion.jpg}} +\logo{\includegraphics[height=1.5cm]{pictures/onion.jpg}} \begin{document} \frame{\titlepage} diff --git a/module4/module4.tex b/module4/module4.tex index a4f2605..5fd5d37 100644 --- a/module4/module4.tex +++ b/module4/module4.tex @@ -25,7 +25,7 @@ The Tor Project } -\logo{\includegraphics[height=1.5cm]{onion.jpg}} +\logo{\includegraphics[height=1.5cm]{pictures/onion.jpg}} \begin{document} \frame{\titlepage} diff --git a/onion.jpg b/onion.jpg deleted file mode 100644 index d728622..0000000 Binary files a/onion.jpg and /dev/null differ diff --git a/pictures/onion.jpg b/pictures/onion.jpg new file mode 100644 index 0000000..d728622 Binary files /dev/null and b/pictures/onion.jpg differ

1 0

[curriculum/master] Moving onion logo into /pictures/
by colin＠torproject.org 29 Jun '15

29 Jun '15

commit 91f3114ccefe6da9ad00d5dc9e1a070a717ce9fd Author: Colin Childs <colin(a)torproject.org> Date: Wed Apr 15 20:13:14 2015 -0500 Moving onion logo into /pictures/ --- module1/module1.tex | 2 +- module2/module2.tex | 2 +- module3/module3.tex | 2 +- module4/module4.tex | 2 +- onion.jpg | Bin 3911 -> 0 bytes pictures/onion.jpg | Bin 0 -> 3911 bytes 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module1/module1.tex b/module1/module1.tex index 54f196e..d2022b7 100644 --- a/module1/module1.tex +++ b/module1/module1.tex @@ -26,7 +26,7 @@ The Tor Project } -\logo{\includegraphics[height=1.5cm]{onion.jpg}} +\logo{\includegraphics[height=1.5cm]{pictures/onion.jpg}} \begin{document} \frame{\titlepage} diff --git a/module2/module2.tex b/module2/module2.tex index 950ec01..e880a81 100644 --- a/module2/module2.tex +++ b/module2/module2.tex @@ -21,7 +21,7 @@ The Tor Project } -\logo{\includegraphics[height=1.5cm]{onion.jpg}} +\logo{\includegraphics[height=1.5cm]{pictures/onion.jpg}} \begin{document} \frame{\titlepage} diff --git a/module3/module3.tex b/module3/module3.tex index 2fd0d41..39f004f 100644 --- a/module3/module3.tex +++ b/module3/module3.tex @@ -21,7 +21,7 @@ The Tor Project } -\logo{\includegraphics[height=1.5cm]{onion.jpg}} +\logo{\includegraphics[height=1.5cm]{pictures/onion.jpg}} \begin{document} \frame{\titlepage} diff --git a/module4/module4.tex b/module4/module4.tex index a4f2605..5fd5d37 100644 --- a/module4/module4.tex +++ b/module4/module4.tex @@ -25,7 +25,7 @@ The Tor Project } -\logo{\includegraphics[height=1.5cm]{onion.jpg}} +\logo{\includegraphics[height=1.5cm]{pictures/onion.jpg}} \begin{document} \frame{\titlepage} diff --git a/onion.jpg b/onion.jpg deleted file mode 100644 index d728622..0000000 Binary files a/onion.jpg and /dev/null differ diff --git a/pictures/onion.jpg b/pictures/onion.jpg new file mode 100644 index 0000000..d728622 Binary files /dev/null and b/pictures/onion.jpg differ

1 0