December 2013 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-24.1.1esr-1] backport of bug 931053 to avoid building breakpad code in cross-compilation environments (which is currently broken)
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit e4cb02e8e79d71204682e65e736aab81d1591dd3 Author: Georg Koppen <g.koppen(a)jondos.de> Date: Tue Nov 12 09:54:43 2013 +0100 backport of bug 931053 to avoid building breakpad code in cross-compilation environments (which is currently broken) --- toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in | 2 ++ toolkit/crashreporter/google-breakpad/src/common/mac/moz.build | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in index ca069b3..97fac11 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in @@ -23,11 +23,13 @@ DISABLED_CMMSRCS = \ MachIPC.mm \ $(NULL) +ifdef MOZ_CRASHREPORTER HOST_CPPSRCS = $(CPPSRCS) HOST_CMMSRCS = \ dump_syms.mm \ $(NULL) +endif # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build index b872a0c..6d1efa4 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build @@ -17,7 +17,9 @@ CPP_SOURCES += [ 'string_utilities.cc', ] -HOST_LIBRARY_NAME = 'host_breakpad_mac_common_s' +if CONFIG['MOZ_CRASHREPORTER']: + HOST_LIBRARY_NAME = 'host_breakpad_mac_common_s' + CMMSRCS += [ 'MachIPC.mm', ]

1 0

[tor-browser/tor-browser-24.1.1esr-1] Ray's otool patch
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit 88ff5a23f6585f1f9c248082e0f3103e4933b2d2 Author: Georg Koppen <g.koppen(a)jondos.de> Date: Tue Nov 12 15:45:50 2013 +0100 Ray's otool patch --- toolkit/library/dependentlibs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py index 54e2b86..c8f9d15 100644 --- a/toolkit/library/dependentlibs.py +++ b/toolkit/library/dependentlibs.py @@ -71,7 +71,7 @@ def dependentlibs_readelf(lib): def dependentlibs_otool(lib): '''Returns the list of dependencies declared in the given MACH-O dylib''' - proc = subprocess.Popen(['otool', '-l', lib], stdout = subprocess.PIPE) + proc = subprocess.Popen([TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE) deps= [] cmd = None for line in proc.stdout:

1 0

[tor-browser/tor-browser-24.1.1esr-1] new .mozconfig file for the new cross-compiler and ESR24
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit 16836470c4f84f85c86ce140262c1cb6b0b0fa58 Author: Georg Koppen <georg(a)getfoxyproxy.org> Date: Fri Nov 29 15:17:56 2013 +0100 new .mozconfig file for the new cross-compiler and ESR24 --- .mozconfig-mac | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index 79a40fe..25a3f7d 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -1,23 +1,46 @@ -#Specify the cross compile export CROSS_COMPILE=1 -ac_add_options --enable-application=browser -ac_add_options --target=i686-apple-darwin11 -#ac_add_options --enable-default-toolkit=cairo-windows +SYSROOTDIR=/usr/lib/apple/SDKs/MacOSX10.6.sdk +ROOTDIR="$HOME/build/x-tools/x86_64-apple-darwin10/bin" +FLAGS="-arch i386 -isysroot $SYSROOTDIR" + +# Ideally we use the patch provided in +# https://bugzilla.mozilla.org/show_bug.cgi?id=933071 to get rid of our path +# symlinks but for some reason that does not work. While Firefox is not +# complaining with this patch on compile time anymore it won't start... +# CROSS_PRIVATE_FRAMEWORKS=$SYSROOTDIR/System/Library/PrivateFrameworks + +# Needed for our otool patch +TOOLCHAIN_PREFIX=x86_64-apple-darwin10- + +CC="$ROOTDIR/x86_64-apple-darwin10-clang $FLAGS" +CXX="$ROOTDIR/x86_64-apple-darwin10-clang++ $FLAGS" + +# We need them as configure is looking for i386-apple-darwin10-* which is not +# existing. +RANLIB=$ROOTDIR/x86_64-apple-darwin10-ranlib +AR=$ROOTDIR/x86_64-apple-darwin10-ar +AS=$ROOTDIR/x86_64-apple-darwin10-as +LD=$ROOTDIR/x86_64-apple-darwin10-ld +STRIP=$ROOTDIR/x86_64-apple-darwin10-strip + mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser -mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -ac_add_options --disable-debug -ac_add_options --enable-optimize +ac_add_options --target=i386-apple-darwin10 +ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding +ac_add_options --enable-optimize +ac_add_options --disable-debug +# See above for a reason why this is currently disabled +# ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -#ac_add_options --disable-ctypes +# ac_add_options --disable-ctypes

1 0

[tor-browser/tor-browser-24.1.1esr-1] rebased patch 931043 to avoid breaking 64bit cross-compiled builds due to wrong va_list handling
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit 7167f24fc993ae6f1a3a5ee9800ed2fa9fdc6874 Author: Georg Koppen <g.koppen(a)jondos.de> Date: Mon Nov 11 14:01:15 2013 +0100 rebased patch 931043 to avoid breaking 64bit cross-compiled builds due to wrong va_list handling --- configure.in | 69 +++++++++++++++------------------------------------ js/src/configure.in | 68 +++++++++++++++----------------------------------- 2 files changed, 40 insertions(+), 97 deletions(-) diff --git a/configure.in b/configure.in index ddc813a..7569b26 100644 --- a/configure.in +++ b/configure.in @@ -3416,13 +3416,10 @@ AC_LANG_C dnl ********************** dnl *** va_copy checks *** -dnl ********************** -dnl we currently check for all three va_copy possibilities, so we get -dnl all results in config.log for bug reports. -AC_MSG_CHECKING(for an implementation of va_copy()) -AC_CACHE_VAL(ac_cv_va_copy,[ - AC_TRY_RUN([ - #include <stdarg.h> +AC_CACHE_CHECK([for an implementation of va_copy()], + ac_cv_va_copy, + [AC_TRY_COMPILE([#include <stdarg.h> + #include <stdlib.h> void f (int i, ...) { va_list args1, args2; va_start (args1, i); @@ -3430,37 +3427,16 @@ AC_CACHE_VAL(ac_cv_va_copy,[ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) exit (1); va_end (args1); va_end (args2); - } - int main() { f (0, 42); return 0; }], - ac_cv_va_copy=yes, - ac_cv_va_copy=no, - ac_cv_va_copy=no - ) -]) -AC_MSG_RESULT($ac_cv_va_copy) -AC_MSG_CHECKING(for an implementation of __va_copy()) -AC_CACHE_VAL(ac_cv___va_copy,[ - AC_TRY_RUN([ - #include <stdarg.h> - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); - __va_copy (args2, args1); - if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) - exit (1); - va_end (args1); va_end (args2); - } - int main() { f (0, 42); return 0; }], - ac_cv___va_copy=yes, - ac_cv___va_copy=no, - ac_cv___va_copy=no - ) -]) -AC_MSG_RESULT($ac_cv___va_copy) -AC_MSG_CHECKING(whether va_lists can be copied by value) -AC_CACHE_VAL(ac_cv_va_val_copy,[ - AC_TRY_RUN([ - #include <stdarg.h> + }], + [f(0, 42); return 0], + [ac_cv_va_copy=yes], + [ac_cv_va_copy=no] + )] +) +AC_CACHE_CHECK([whether va_list can be copied by value], + ac_cv_va_val_copy, + [AC_TRY_COMPILE([#include <stdarg.h> + #include <stdlib.h> void f (int i, ...) { va_list args1, args2; va_start (args1, i); @@ -3468,25 +3444,20 @@ AC_CACHE_VAL(ac_cv_va_val_copy,[ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) exit (1); va_end (args1); va_end (args2); - } - int main() { f (0, 42); return 0; }], - ac_cv_va_val_copy=yes, - ac_cv_va_val_copy=no, - ac_cv_va_val_copy=yes - ) -]) + }], + [f(0, 42); return 0], + [ac_cv_va_val_copy=yes], + [ac_cv_va_val_copy=no], + )] +) if test "x$ac_cv_va_copy" = "xyes"; then AC_DEFINE(VA_COPY, va_copy) AC_DEFINE(HAVE_VA_COPY) -elif test "x$ac_cv___va_copy" = "xyes"; then - AC_DEFINE(VA_COPY, __va_copy) - AC_DEFINE(HAVE_VA_COPY) fi if test "x$ac_cv_va_val_copy" = "xno"; then AC_DEFINE(HAVE_VA_LIST_AS_ARRAY) fi -AC_MSG_RESULT($ac_cv_va_val_copy) dnl =================================================================== dnl ======================================================== diff --git a/js/src/configure.in b/js/src/configure.in index 183b9de..46a076c 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -2778,12 +2778,10 @@ AC_LANG_C dnl ********************** dnl *** va_copy checks *** dnl ********************** -dnl we currently check for all three va_copy possibilities, so we get -dnl all results in config.log for bug reports. -AC_MSG_CHECKING(for an implementation of va_copy()) -AC_CACHE_VAL(ac_cv_va_copy,[ - AC_TRY_RUN([ - #include <stdarg.h> +AC_CACHE_CHECK([for an implementation of va_copy()], + ac_cv_va_copy, + [AC_TRY_COMPILE([#include <stdarg.h> + #include <stdlib.h> void f (int i, ...) { va_list args1, args2; va_start (args1, i); @@ -2791,37 +2789,16 @@ AC_CACHE_VAL(ac_cv_va_copy,[ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) exit (1); va_end (args1); va_end (args2); - } - int main() { f (0, 42); return 0; }], - ac_cv_va_copy=yes, - ac_cv_va_copy=no, - ac_cv_va_copy=no - ) -]) -AC_MSG_RESULT($ac_cv_va_copy) -AC_MSG_CHECKING(for an implementation of __va_copy()) -AC_CACHE_VAL(ac_cv___va_copy,[ - AC_TRY_RUN([ - #include <stdarg.h> - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); - __va_copy (args2, args1); - if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) - exit (1); - va_end (args1); va_end (args2); - } - int main() { f (0, 42); return 0; }], - ac_cv___va_copy=yes, - ac_cv___va_copy=no, - ac_cv___va_copy=no - ) -]) -AC_MSG_RESULT($ac_cv___va_copy) -AC_MSG_CHECKING(whether va_lists can be copied by value) -AC_CACHE_VAL(ac_cv_va_val_copy,[ - AC_TRY_RUN([ - #include <stdarg.h> + }], + [f(0, 42); return 0], + [ac_cv_va_copy=yes], + [ac_cv_va_copy=no] + )] +) +AC_CACHE_CHECK([whether va_list can be copied by value], + ac_cv_va_val_copy, + [AC_TRY_COMPILE([#include <stdarg.h> + #include <stdlib.h> void f (int i, ...) { va_list args1, args2; va_start (args1, i); @@ -2829,25 +2806,20 @@ AC_CACHE_VAL(ac_cv_va_val_copy,[ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) exit (1); va_end (args1); va_end (args2); - } - int main() { f (0, 42); return 0; }], - ac_cv_va_val_copy=yes, - ac_cv_va_val_copy=no, - ac_cv_va_val_copy=yes - ) -]) + }], + [f(0, 42); return 0], + [ac_cv_va_val_copy=yes], + [ac_cv_va_val_copy=no], + )] +) if test "x$ac_cv_va_copy" = "xyes"; then AC_DEFINE(VA_COPY, va_copy) AC_DEFINE(HAVE_VA_COPY) -elif test "x$ac_cv___va_copy" = "xyes"; then - AC_DEFINE(VA_COPY, __va_copy) - AC_DEFINE(HAVE_VA_COPY) fi if test "x$ac_cv_va_val_copy" = "xno"; then AC_DEFINE(HAVE_VA_LIST_AS_ARRAY) fi -AC_MSG_RESULT($ac_cv_va_val_copy) dnl =================================================================== dnl ========================================================

1 0

[translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
by translation＠torproject.org 02 Dec '13

02 Dec '13

commit 05879d2582ec0a85f3c97e59701ec9d7a92e1c8f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 2 12:16:26 2013 +0000 Update translations for torbutton-brandproperties --- id/brand.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/id/brand.properties b/id/brand.properties index bc9f7ef..15e994d 100644 --- a/id/brand.properties +++ b/id/brand.properties @@ -6,10 +6,10 @@ brandShortName=TorBrowser brandFullName=Peramban Tor vendorShortName=Proyek Tor -# homePageSingleStartMain=Firefox Start, a fast home page with built-in search +homePageSingleStartMain=Mulai Firefox, halaman muka yang cepat dengan pencarian bawaan # homePageImport=Import your home page from %S -# homePageMigrationPageTitle=Home Page Selection -# homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Seleksi Halaman Depan +homePageMigrationDescription=Silakan pilih halaman muka yang ingin Anda gunakan: -# syncBrandShortName=Sync +syncBrandShortName=Sinkronkan

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 02 Dec '13

02 Dec '13

commit 64a5c8abb31fb0b60f2217ec6a4815555db0f288 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 2 12:16:19 2013 +0000 Update translations for tor-launcher-network-settings --- id/network-settings.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index e7944c6..cca5d47 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "Tidak"> <!ENTITY torSettings.firstQuestion "Yang mana dari di bawah ini cocok dengan situasi anda?"> -<!ENTITY torSettings.configurePrompt1 ""> +<!ENTITY torSettings.configurePrompt1 "Koneksi internet komputer ini disensor, disaring, atau diladeni pewali."> <!ENTITY torSettings.configurePrompt2 "Saya perlu menyesuaikan pengaturan network."> <!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connectPrompt1 "Koneksi Internet komputer ini telah bebas dari halangan."> @@ -27,7 +27,7 @@  <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai..."> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.restart "Restart"> <!ENTITY torsettings.optional "Opsional"> @@ -44,12 +44,12 @@ <!ENTITY torsettings.firewall.checkbox "Komputer ini pergi melalui firewall yang hanya mengizinkan koneksi untuk beberapa port"> <!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:"> <!ENTITY torsettings.useBridges.checkbox "Internet Service Provider (ISP) saya memblokir koneksi ke jaringan Tor"> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.label "Masukkan satu atau beberapa jembatan penyambung (satu per baris)."> +<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> <!ENTITY torsettings.copyLog "Salin Log Tor Ke Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay"> <!ENTITY torsettings.bridgeHelp1 "Jika kamu tidak dapat terhubung ke jaringan Tor, itu mungkin dikarenakan Penyedia Layanan Internet (ISP) anda atau agen lainnya memblokir Tor.&#160; Biasanya, kamu dapat memecahkan masalah ini dengan menggunakan Tor Bridges dimana merupakan relay tersembunyi yang lebih sulit untuk diblokir."> <!ENTITY torsettings.bridgeHelp2 "Untuk mengumpulkan bridge relays, gunakan web browser untuk mengunjungi halaman ini: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> +<!ENTITY torsettings.bridgeHelp4 "You can also request bridge relays by sending mail to help(a)rt.torproject.org.">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 02 Dec '13

02 Dec '13

commit f94da0463dfbbb20372434a6248b635dbbd8e617 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 2 12:16:03 2013 +0000 Update translations for https_everywhere_completed --- id/https-everywhere.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/id/https-everywhere.properties b/id/https-everywhere.properties index 20e88ce..487dd39 100644 --- a/id/https-everywhere.properties +++ b/id/https-everywhere.properties @@ -5,3 +5,4 @@ https-everywhere.menu.noRules = (Halaman ini Tidak Diatur) https-everywhere.menu.unknownRules = (Aturan untuk Halaman ini Tidak Diketahui) https-everywhere.toolbar.hint = HTTPS Everywhere sekarang aktif. Kamu dapat mengaktifkannya berdasarkan site-by-site dengan mengklik ikon dibilah alamat. https-everywhere.migration.notification0 = Dalam rangka mengimplementasikan perbaikan yang krusial, pembaharuan ini menjalankan ulang peraturan preferensi HTTPS Everywhere anda ke nilai bawaannya. +https-everywhere.menu.ruleset-tests = Jalankan pengujian aturan HTTPS Everywhere

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 02 Dec '13

02 Dec '13

commit e3cd7b7494205d55717b836ce4fc17c6f9ffa87e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 2 12:15:59 2013 +0000 Update translations for https_everywhere --- id/https-everywhere.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/https-everywhere.properties b/id/https-everywhere.properties index 84fa5d5..487dd39 100644 --- a/id/https-everywhere.properties +++ b/id/https-everywhere.properties @@ -5,4 +5,4 @@ https-everywhere.menu.noRules = (Halaman ini Tidak Diatur) https-everywhere.menu.unknownRules = (Aturan untuk Halaman ini Tidak Diketahui) https-everywhere.toolbar.hint = HTTPS Everywhere sekarang aktif. Kamu dapat mengaktifkannya berdasarkan site-by-site dengan mengklik ikon dibilah alamat. https-everywhere.migration.notification0 = Dalam rangka mengimplementasikan perbaikan yang krusial, pembaharuan ini menjalankan ulang peraturan preferensi HTTPS Everywhere anda ke nilai bawaannya. -# https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests +https-everywhere.menu.ruleset-tests = Jalankan pengujian aturan HTTPS Everywhere

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 02 Dec '13

02 Dec '13

commit 8449629ae47d24a0a57dcf5d51840d7b26e9fa77 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 2 12:15:20 2013 +0000 Update translations for vidalia_alpha --- id/vidalia_id.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/vidalia_id.po b/id/vidalia_id.po index 2d5e6db..a506d55 100644 --- a/id/vidalia_id.po +++ b/id/vidalia_id.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-11-12 09:41+0000\n" +"PO-Revision-Date: 2013-12-02 12:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" @@ -1974,7 +1974,7 @@ msgstr "" msgctxt "MainWindow" msgid "Restart" -msgstr "" +msgstr "Muat ulang" msgctxt "MainWindow" msgid "Reload Tor's config"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 02 Dec '13

02 Dec '13

commit 6b37997e2daf6990bf5b3d25549e2f7095fd27d3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 2 12:15:07 2013 +0000 Update translations for orbot --- values-id/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/values-id/strings.xml b/values-id/strings.xml index 028ec9d..0f4c4cc 100644 --- a/values-id/strings.xml +++ b/values-id/strings.xml @@ -17,6 +17,7 @@ <string name="menu_settings">Pengaturan</string> <string name="menu_log">Log</string> <string name="menu_info">Bantuan</string> + <string name="menu_start">Mulai</string> <string name="menu_about">Mengenai</string> <string name="button_help">Bantuan</string> <string name="button_close">Dekat</string>

1 0