February 2017 - tor-commits - lists.torproject.org

[tor-browser-build/master] Update rbm: Suppress unneeded output in docker_remote_get
by boklm＠torproject.org 16 Feb '17

16 Feb '17

commit 7d44af3b7b137ccb0adc560d3c90e8dc1783a976 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 16 22:30:11 2017 +0100 Update rbm: Suppress unneeded output in docker_remote_get --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index b0382cc..b3ca063 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit b0382ccc58b9286e066bf5980f80cf041e287067 +Subproject commit b3ca063713f0d25a66f76c829d750ac977a25207

1 0

[tor/master] Merge remote-tracking branch 'meejah/ticket-21329-onions-current'
by nickm＠torproject.org 16 Feb '17

16 Feb '17

commit 31be66ea5ae243644f79d7f8a7d728cd9537c79d Merge: 832d463 fc58c37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 16 09:40:56 2017 -0500 Merge remote-tracking branch 'meejah/ticket-21329-onions-current' changes/bug21329 | 3 +++ src/or/control.c | 13 +++++++------ src/or/control.h | 5 +++++ src/test/test_controller.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 6 deletions(-)

1 0

[tor/master] Ticket #21329: GETINFO onions/current returns empty list
by nickm＠torproject.org 16 Feb '17

16 Feb '17

commit fc58c37e334fec71a204b7b0787d347b647618b8 Author: meejah <meejah(a)meejah.ca> Date: Sat Jan 28 13:49:18 2017 -0700 Ticket #21329: GETINFO onions/current returns empty list If there are no ephemeral or detached onion services, then "GETINFO onions/current" or "GETINFO onions/detached" should return an empty list instead of an error --- changes/bug21329 | 3 +++ src/or/control.c | 13 +++++++------ src/or/control.h | 5 +++++ src/test/test_controller.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/changes/bug21329 b/changes/bug21329 new file mode 100644 index 0000000..60b9363 --- /dev/null +++ b/changes/bug21329 @@ -0,0 +1,3 @@ + o Minor bugfixes (controller): + - GETINFO onions/current and onions/detached no longer 551 on empty lists + Fixes bug 21329 diff --git a/src/or/control.c b/src/or/control.c index 857b732..cc46cb1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2824,12 +2824,13 @@ getinfo_helper_events(control_connection_t *control_conn, /** Implementation helper for GETINFO: knows how to enumerate hidden services * created via the control port. */ -static int +STATIC int getinfo_helper_onions(control_connection_t *control_conn, const char *question, char **answer, const char **errmsg) { smartlist_t *onion_list = NULL; + (void) errmsg; /* no errors from this method */ if (control_conn && !strcmp(question, "onions/current")) { onion_list = control_conn->ephemeral_onion_services; @@ -2839,13 +2840,13 @@ getinfo_helper_onions(control_connection_t *control_conn, return 0; } if (!onion_list || smartlist_len(onion_list) == 0) { - if (errmsg) { - *errmsg = "No onion services of the specified type."; + if (answer) { + *answer = tor_strdup(""); } - return -1; - } - if (answer) { + } else { + if (answer) { *answer = smartlist_join_strings(onion_list, "\r\n", 0, NULL); + } } return 0; diff --git a/src/or/control.h b/src/or/control.h index 6330c85..16ba1ed 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -262,6 +262,11 @@ STATIC crypto_pk_t *add_onion_helper_keyarg(const char *arg, int discard_pk, STATIC rend_authorized_client_t * add_onion_helper_clientauth(const char *arg, int *created, char **err_msg_out); +STATIC int getinfo_helper_onions( + control_connection_t *control_conn, + const char *question, + char **answer, + const char **errmsg); STATIC void getinfo_helper_downloads_networkstatus( const char *flavor, download_status_t **dl_to_emit, diff --git a/src/test/test_controller.c b/src/test/test_controller.c index d9c0a1e..fc63d83 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -109,6 +109,44 @@ test_add_onion_helper_keyarg(void *arg) } static void +test_getinfo_helper_onion(void *arg) +{ + (void)arg; + control_connection_t dummy; + /* Get results out */ + char *answer = NULL; + const char *errmsg = NULL; + char *service_id = NULL; + int rt = 0; + + dummy.ephemeral_onion_services = NULL; + + /* successfully get an empty answer */ + rt = getinfo_helper_onions(&dummy, "onions/current", &answer, &errmsg); + tt_assert(rt == 0); + tt_str_op(answer, OP_EQ, ""); + tor_free(answer); + + /* successfully get an empty answer */ + rt = getinfo_helper_onions(&dummy, "onions/detached", &answer, &errmsg); + tt_assert(rt == 0); + tt_str_op(answer, OP_EQ, ""); + tor_free(answer); + + /* get an answer for one onion service */ + service_id = tor_strdup("dummy_onion_id"); + dummy.ephemeral_onion_services = smartlist_new(); + smartlist_add(dummy.ephemeral_onion_services, service_id); + rt = getinfo_helper_onions(&dummy, "onions/current", &answer, &errmsg); + tt_assert(rt == 0); + tt_str_op(answer, OP_EQ, "dummy_onion_id"); + + done: + tor_free(answer); + tor_free(service_id); +} + +static void test_rend_service_parse_port_config(void *arg) { const char *sep = ","; @@ -1332,6 +1370,7 @@ test_download_status_bridge(void *arg) struct testcase_t controller_tests[] = { { "add_onion_helper_keyarg", test_add_onion_helper_keyarg, 0, NULL, NULL }, + { "getinfo_helper_onion", test_getinfo_helper_onion, 0, NULL, NULL }, { "rend_service_parse_port_config", test_rend_service_parse_port_config, 0, NULL, NULL }, { "add_onion_helper_clientauth", test_add_onion_helper_clientauth, 0, NULL,

1 0

[rbm/master] Suppress unneeded output in docker_remote_get
by boklm＠torproject.org 16 Feb '17

16 Feb '17

commit b3ca063713f0d25a66f76c829d750ac977a25207 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 16 14:02:53 2017 +0100 Suppress unneeded output in docker_remote_get --- lib/RBM/DefaultConfig.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index ec03ff0..2f6264e 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -497,7 +497,7 @@ tmpdir=\$(mktemp -d) %] cd \$tmpdir tar -cf - . | tar -C [% dst %] --no-same-owner -xf - -cd - +cd - > /dev/null rm -Rf \$tmpdir OPT_END ####

1 0

[tor/master] Bump master to 0.3.1.0-alpha-dev
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 832d4636f5e05cd4e500b590749ca6bf9e9c10cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 14:36:56 2017 -0500 Bump master to 0.3.1.0-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c9e0c2a..59da60c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.0.3-alpha-dev]) +AC_INIT([tor],[0.3.1.0-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 62e8036..c63f838 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.0.3-alpha-dev" +!define VERSION "0.3.1.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ec4d62b..f7f4f19 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.3-alpha-dev" +#define VERSION "0.3.1.0-alpha-dev"

1 0

[torspec/master] protover: Add new version for prop224 for HSIntro/HSDir
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit b5c4adb0c2b04d90e14d75dbe8fcae4bfc738b0f Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 14 10:47:07 2017 -0500 protover: Add new version for prop224 for HSIntro/HSDir Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- tor-spec.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tor-spec.txt b/tor-spec.txt index f727d51..7ccc90f 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1704,6 +1704,9 @@ see tor-design.pdf. "3" -- supports authentication as of proposal 121 in Tor 0.2.1.6-alpha. + "4" -- support ed25519 authentication keys which is defined by the HS v3 + protocol as part of proposal 224 in Tor 0.3.0.4-alpha. + 9.5. "HSRend" The "HSRend" protocol handles rendezvous points. @@ -1721,6 +1724,9 @@ see tor-design.pdf. "1" -- supports all features in Tor 0.2.0.10-alpha. + "2" -- support ed25519 blinded keys request which is defined by the HS v3 + protocol as part of proposal 224 in Tor 0.3.0.4-alpha. + 9.7. "DirCache" The "DirCache" protocols are the set of documents available for download

1 0

[tor/master] hs: Avoid a strlen(NULL) if descriptor is not found in cache
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 3336f26e60b0f24c8e028ed8fb9aea04d19c5c8a Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 15 10:27:32 2017 -0500 hs: Avoid a strlen(NULL) if descriptor is not found in cache Instead of returning 404 error code, this led to a NULL pointer being used and thus a crash of tor. Fixes #21471 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21471 | 5 +++++ src/or/directory.c | 2 +- src/test/test_hs_cache.c | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/changes/bug21471 b/changes/bug21471 new file mode 100644 index 0000000..684035b --- /dev/null +++ b/changes/bug21471 @@ -0,0 +1,5 @@ + o Major bugfixes (hidden service directory v3): + - When a descriptor lookup was done and it was not found in the directory + cache, it would crash on a NULL pointer instead of returning the 404 + code back to the client like it was suppose to. Fixes bug 21471.; + bugfixes on tor-0.3.0.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index c7f2012..80d3c30 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3533,7 +3533,7 @@ handle_get_hs_descriptor_v3(dir_connection_t *conn, pubkey_str = url + strlen("/tor/hs/3/"); retval = hs_cache_lookup_as_dir(HS_VERSION_THREE, pubkey_str, &desc_str); - if (retval < 0) { + if (retval <= 0 || desc_str == NULL) { write_http_status_line(conn, 404, "Not found"); goto done; } diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c index 64391a7..1943d0f 100644 --- a/src/test/test_hs_cache.c +++ b/src/test/test_hs_cache.c @@ -361,6 +361,15 @@ test_upload_and_download_hs_desc(void *arg) /* Initialize HSDir cache subsystem */ init_test(); + /* Test a descriptor not found in the directory cache. */ + { + ed25519_public_key_t blinded_key; + memset(&blinded_key.pubkey, 'A', sizeof(blinded_key.pubkey)); + received_desc_str = helper_fetch_desc_from_hsdir(&blinded_key); + tt_int_op(strlen(received_desc_str), OP_EQ, 0); + tor_free(received_desc_str); + } + /* Generate a valid descriptor with normal values. */ { ed25519_keypair_t signing_kp; @@ -388,6 +397,15 @@ test_upload_and_download_hs_desc(void *arg) /* Verify we received the exact same descriptor we published earlier */ tt_str_op(received_desc_str, OP_EQ, published_desc_str); + tor_free(received_desc_str); + + /* With a valid descriptor in the directory cache, try again an invalid. */ + { + ed25519_public_key_t blinded_key; + memset(&blinded_key.pubkey, 'A', sizeof(blinded_key.pubkey)); + received_desc_str = helper_fetch_desc_from_hsdir(&blinded_key); + tt_int_op(strlen(received_desc_str), OP_EQ, 0); + } done: tor_free(received_desc_str);

1 0

[tor-browser-build/master] Use binutils 2.24, and Ubuntu-12.04 for Windows builds
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit 7f083aadfe1fd9264c5a5022a3c47f06849eb1e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 17:34:11 2017 +0100 Use binutils 2.24, and Ubuntu-12.04 for Windows builds To be closer to what we currently have in gitian, use binutils 2.24. We also change tho OS to Ubuntu 12.04 for Windows builds, except for the tor-browser bundle step, where we are staying with 14.10. We are using 14.10 in the tor-browser step because the version of python-pefile we use fails on Ubuntu 12.04. The reason for using a recent version of python-pefile is that the older versions don't work on x86_64. And we are using an x86_64 container because docker does not support i386 containers. The problem is not present in gitian where we are using an i386 VM. An other possible solution could be to build a recent version of python. --- projects/binutils/build | 4 +- projects/binutils/config | 7 +- projects/binutils/enable-reloc-section-ld.patch | 48 ++++----- projects/binutils/peXXigen.patch | 14 +++ projects/binutils/specify-timestamp.patch | 123 ------------------------ projects/firefox/build | 12 +++ projects/firefox/config | 3 + projects/gcc/config | 3 + projects/tor-browser/config | 1 + rbm.conf | 2 +- 10 files changed, 63 insertions(+), 154 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index 3ff4bdb..b7a6e72 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -23,9 +23,7 @@ cd [% project %]-[% c("version") %] sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch -# specify-timestamp patch from Stephen Kitt <steve(a)sk2.org> -# https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ -patch -p2 < ../specify-timestamp.patch +patch -p1 < ../peXXigen.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j4 diff --git a/projects/binutils/config b/projects/binutils/config index dfb1483..c1e67df 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.25 +version: 2.24 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 var: @@ -18,8 +18,5 @@ input_files: - project: docker-image - filename: enable-reloc-section-ld.patch enable: '[% c("var/windows") %]' - - # specify-timestamp patch from Stephen Kitt <steve(a)sk2.org> - # https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ - - filename: specify-timestamp.patch + - filename: peXXigen.patch enable: '[% c("var/windows") %]' diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch index 15ab4d8..f393f51 100644 --- a/projects/binutils/enable-reloc-section-ld.patch +++ b/projects/binutils/enable-reloc-section-ld.patch @@ -1,9 +1,10 @@ -From 6ef8bae3d2a4f4704c4a32f786c9574db3e70f25 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 ++++++- @@ -12,18 +13,18 @@ Patch by skruffy. 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 979cc8b8e960..4a63863289c8 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}, @@ -31,7 +32,7 @@ index 979cc8b8e960..4a63863289c8 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; @@ -41,7 +42,7 @@ index 979cc8b8e960..4a63863289c8 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) @@ -50,20 +51,20 @@ index 979cc8b8e960..4a63863289c8 100644 ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b24a60820237..caf294663a80 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}, @@ -71,7 +72,7 @@ index b24a60820237..caf294663a80 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; @@ -81,7 +82,7 @@ index b24a60820237..caf294663a80 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 @@ -90,10 +91,10 @@ index b24a60820237..caf294663a80 100644 { pep_dll_fill_sections (link_info.output_bfd, &link_info); diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index 61d8fa5c7eea..24c0c72a6685 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; @@ -199,10 +200,10 @@ index 61d8fa5c7eea..24c0c72a6685 100644 bfd_boolean diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 24ea30237aeb..6a0d6338646b 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; @@ -210,3 +211,6 @@ index 24ea30237aeb..6a0d6338646b 100644 extern int pe_dll_kill_ats; extern int pe_dll_stdcall_aliases; extern int pe_dll_warn_dup_exports; +-- +2.0.1 + diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch new file mode 100644 index 0000000..785aa02 --- /dev/null +++ b/projects/binutils/peXXigen.patch @@ -0,0 +1,14 @@ +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/projects/binutils/specify-timestamp.patch b/projects/binutils/specify-timestamp.patch deleted file mode 100644 index 37f4347..0000000 --- a/projects/binutils/specify-timestamp.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- a/upstream/bfd/peXXigen.c -+++ b/upstream/bfd/peXXigen.c -@@ -66,6 +66,9 @@ - #include <wchar.h> - #endif - -+#include <errno.h> -+#include <limits.h> -+ - /* NOTE: it's strange to be including an architecture specific header - in what's supposed to be general (to PE/PEI) code. However, that's - where the definitions are, and they don't vary per architecture -@@ -873,8 +876,36 @@ - H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns); - - /* 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); -+ if (pe_data (abfd)->insert_timestamp) { -+ time_t now; -+ char *source_date_epoch; -+ unsigned long long epoch; -+ char *endptr; -+ -+ now = time(NULL); -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", -+ strerror(errno)); -+ } else if (endptr == source_date_epoch) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", -+ endptr); -+ } else if (*endptr != '\0') { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", -+ endptr); -+ } else if (epoch > ULONG_MAX) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", -+ ULONG_MAX, epoch); -+ } else { -+ now = epoch; -+ } -+ } -+ H_PUT_32 (abfd, now, filehdr_out->f_timdat); -+ } - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); ---- a/upstream/ld/pe-dll.c -+++ b/upstream/ld/pe-dll.c -@@ -26,6 +26,8 @@ - #include "filenames.h" - #include "safe-ctype.h" - -+#include <errno.h> -+#include <limits.h> - #include <time.h> - - #include "ld.h" -@@ -1185,8 +1187,36 @@ - - memset (edata_d, 0, edata_sz); - -- if (pe_data (abfd)->insert_timestamp) -- H_PUT_32 (abfd, time (0), edata_d + 4); -+ if (pe_data (abfd)->insert_timestamp) { -+ time_t now; -+ char *source_date_epoch; -+ unsigned long long epoch; -+ char *endptr; -+ -+ now = time(NULL); -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", -+ strerror(errno)); -+ } else if (endptr == source_date_epoch) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", -+ endptr); -+ } else if (*endptr != '\0') { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", -+ endptr); -+ } else if (epoch > ULONG_MAX) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", -+ ULONG_MAX, epoch); -+ } else { -+ now = epoch; -+ } -+ } -+ H_PUT_32 (abfd, now, edata_d + 4); -+ } - - if (pe_def_file->version_major != -1) - { ---- a/upstream/ld/emultempl/pe.em -+++ b/upstream/ld/emultempl/pe.em -@@ -307,7 +307,7 @@ - OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, - {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, - {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, -- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, -+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, - {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, - #ifdef DLL_SUPPORT - /* getopt allows abbreviations, so we do this to stop it ---- a/upstream/ld/emultempl/pep.em -+++ b/upstream/ld/emultempl/pep.em -@@ -324,7 +324,7 @@ - {"no-bind", no_argument, NULL, OPTION_NO_BIND}, - {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, - {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, -- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, -+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, - {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, - {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, - {NULL, no_argument, NULL, 0} diff --git a/projects/firefox/build b/projects/firefox/build index 67547f7..a8ef12f 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,6 +1,18 @@ #!/bin/bash set -e rootdir=$(pwd) +[% IF c("var/windows") -%] + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gcc') %] + hgccdir=/var/tmp/dist/gcc + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + ln -s gcc $hgccdir/bin/cc + # Make sure our GCC (as host compiler) get used. We do that before + # compiler setup so that mingw is first in the PATH. + export LD_LIBRARY_PATH=$hgccdir/lib64 + export PATH=$hgccdir/bin:$PATH +[% END -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/firefox/config b/projects/firefox/config index 578d353..96be619 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -89,3 +89,6 @@ input_files: - URL: https://people.torproject.org/~mikeperry/mirrors/sources/msvcr100.dll sha256sum: 1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 enable: '[% c("var/windows") %]' + - project: gcc + name: gcc + enable: '[% c("var/windows") %]' diff --git a/projects/gcc/config b/projects/gcc/config index 7a89e44..bf73b7d 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -38,6 +38,9 @@ targets: osx-x86_64: var: configure_opt: --enable-multilib --enable-languages=c,c++ + windows-i686: + var: + configure_opt: --disable-multilib --enable-languages=c,c++ input_files: - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2' sha256sum: b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 5ee8be7..95f444d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -24,6 +24,7 @@ targets: - bzip2 - faketime windows-i686: + distribution: Ubuntu-14.10 var: mar_osname: win32 diff --git a/rbm.conf b/rbm.conf index 802bb48..5faf4cb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -107,7 +107,7 @@ targets: torbrowser-windows-i686: - windows-i686 windows-i686: - distribution: Ubuntu-14.10 + distribution: Ubuntu-12.04 arch: i686 var: windows: 1

1 0

[tor-browser-build/master] Update mingw-w64 commit
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit e41c159ed1d3a150720eaaad6716662ffe07db03 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 17:27:30 2017 +0100 Update mingw-w64 commit Use the same commit as we currently use in gitian. --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 4141b60..425e125 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 3deeda3a1db3dee8a8b6231be5b44f47d79ce1d7 +git_hash: a0cd5afeb60be3be0860e9a203314c10485bb9b8 version: '[% c("abbrev") %]' remote_docker: 1 var:

1 0

[tor-browser-build/master] projects/tor: build with --enable-static-openssl on OSX
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit 9ec25911d21fda4eecec93f802a875e4c000ecfe Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 13:26:35 2017 +0100 projects/tor: build with --enable-static-openssl on OSX --- projects/tor/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor/build b/projects/tor/build index a568512..95328a7 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -57,6 +57,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ + [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") -%] export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1

1 0