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

[tor-messenger-build/master] Fix Windows build of ctypes-otr
by boklm＠torproject.org 28 Nov '14

28 Nov '14

commit b092ffc2994aed02e8d8c380aa5335efedb66861 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 27 23:27:31 2014 +0100 Fix Windows build of ctypes-otr --- projects/ctypes-otr/build | 6 +++--- projects/ctypes-otr/config | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build index 89ed37f..f86c75a 100644 --- a/projects/ctypes-otr/build +++ b/projects/ctypes-otr/build @@ -2,11 +2,11 @@ set -e tar xf [% project %]-[% c('version') %].tar.gz tar xf [% c('input_files_by_name/libotr') %] -mv libotr/lib/*.so* [% project %]-[% c('version') %]/chrome/content/ +mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ tar xf [% c('input_files_by_name/libgcrypt') %] -mv libgcrypt/lib/*.so* [% project %]-[% c('version') %]/chrome/content/ +mv libgcrypt/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ tar xf [% c('input_files_by_name/libgpg-error') %] -mv libgpg-error/lib/*.so* [% project %]-[% c('version') %]/chrome/content/ +mv libgpg-error/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ [% SET src_dir=project _ '-' _ c('version'); c('tar', { tar_src => [src_dir], diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 4be3f38..8d4a662 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -3,6 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/arlolra/ctypes-otr git_hash: master filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +var: + lib_glob: 'lib/*.so*' +targets: + windows-i686: + var: + lib_glob: 'bin/*.dll' input_files: - name: libotr project: libotr

1 0

[tor-messenger-build/master] Remove useless pkg_type in input files
by boklm＠torproject.org 28 Nov '14

28 Nov '14

commit 67c007e98004bbcdd59d03be45020b363c4a850a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 27 22:49:38 2014 +0100 Remove useless pkg_type in input files A default pkg_type is already defined in rbm.conf. --- projects/ctypes-otr/config | 2 -- projects/libgcrypt/config | 1 - projects/tor-messenger/config | 4 ---- 3 files changed, 7 deletions(-) diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 353bfe5..4bdff55 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -5,9 +5,7 @@ filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_i input_files: - name: libotr project: libotr - pkg_type: build - name: libgcrypt project: libgcrypt - pkg_type: build - name: libgpg-error project: libgpg-error diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index c0454f2..3b763b5 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -29,7 +29,6 @@ input_files: gpg_keyring: libgcrypt.gpg - project: libgpg-error name: libgpg-error - pkg_type: build - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - project: docker-image diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index fee87e2..b9dda95 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -3,16 +3,12 @@ filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil input_files: - name: instantbird project: instantbird - pkg_type: build - project: ctypes-otr name: ctypes-otr - pkg_type: build - project: tor-launcher name: tor-launcher - pkg_type: build - project: tor-browser name: tor-browser - pkg_type: build - project: gcc name: gcc enable: '[% c("var/linux") %]'

1 0

[tor-messenger-build/master] Copy the right libstdc++.so.6 on linux-i686
by boklm＠torproject.org 28 Nov '14

28 Nov '14

commit 49ef4043aa00450e2ab913e160db2a4dd4cdf1e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 27 22:42:24 2014 +0100 Copy the right libstdc++.so.6 on linux-i686 --- projects/tor-messenger/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 5690fac..3f7cd1b 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -7,7 +7,7 @@ tar xf [% c('input_files_by_name/gcc') %] chmod 755 start-tor-messenger mv start-tor-messenger instantbird/ mkdir -p instantbird/lib -cp -L gcc/lib64/libstdc++.so.6 instantbird/lib/ +cp -L gcc/lib[% c('arch') == 'x86_64' ? '64' : '32' %]/libstdc++.so.6 instantbird/lib/ [% END %] cd instantbird/extensions

1 0

[tor-messenger-build/master] Set vim filetype on rbm config files
by boklm＠torproject.org 28 Nov '14

28 Nov '14

commit e75c7d3ecfa2f5c3f6aa14d1e412bc0206b27c7c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 27 23:25:56 2014 +0100 Set vim filetype on rbm config files --- projects/binutils/config | 1 + projects/ctypes-otr/config | 1 + projects/docker-image/config | 1 + projects/gcc/config | 1 + projects/instantbird/config | 1 + projects/libgcrypt/config | 1 + projects/libgpg-error/config | 1 + projects/libotr/config | 1 + projects/mingw-w64/config | 1 + projects/mozilla/config | 1 + projects/python/config | 1 + projects/tor-browser/config | 1 + projects/tor-launcher/config | 1 + projects/tor-messenger/config | 1 + rbm.conf | 1 + 15 files changed, 15 insertions(+) diff --git a/projects/binutils/config b/projects/binutils/config index ea17db0..9fe26ea 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: 2.24 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 4bdff55..4be3f38 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: '[% c("abbrev") %]' git_url: https://github.com/arlolra/ctypes-otr git_hash: master diff --git a/projects/docker-image/config b/projects/docker-image/config index b84de53..3e6c99c 100644 --- a/projects/docker-image/config +++ b/projects/docker-image/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml filename: '[% sha256(c("pre")).substr(0, 12) %]' remote_docker: 1 docker_image_prefix: 'tor-messenger_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME : ENV.USER ? ENV.USER : c("uid") %]' diff --git a/projects/gcc/config b/projects/gcc/config index 9ef8776..4de95f0 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: 4.9.1 remote_docker: 1 diff --git a/projects/instantbird/config b/projects/instantbird/config index 1fb3023..30af0f4 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/releases-comm-central git_hash: master diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index 3b763b5..269e483 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: 1.6.2 remote_docker: 1 diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index ca1b2bf..0f749ff 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: 1.16 remote_docker: 1 diff --git a/projects/libotr/config b/projects/libotr/config index 8fa54c7..c709497 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: 4.1.0 filename: 'libotr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 8b376ec..020cb70 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 #git_hash: 469ed5d227202b373409c8a3b4c1358be39b9983 diff --git a/projects/mozilla/config b/projects/mozilla/config index ebe0a09..ea23187 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/gecko-dev git_hash: master diff --git a/projects/python/config b/projects/python/config index 4007a29..357f87a 100644 --- a/projects/python/config +++ b/projects/python/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: 2.7.8 filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/codename") %]-[% c("var/build_id") %].tar.gz' lsb_release: diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 310445b..edb96fc 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: 4.0.1 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].tar.xz' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index eae7385..dd2f1d1 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: 0.2.7.0.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index b9dda95..fd02424 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml version: 0 filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.xz' input_files: diff --git a/rbm.conf b/rbm.conf index 1a92588..0d385b4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -1,3 +1,4 @@ +# vim: filetype=yaml fetch: 0 debug: 1 compress_tar: gz

1 0

[tor-messenger-build/master] Add a no_build_id target
by boklm＠torproject.org 28 Nov '14

28 Nov '14

commit b7ebe9c02c861f0c972122a712c6b446a5462690 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 27 23:19:22 2014 +0100 Add a no_build_id target The no_build_id target can be useful if you want to quickly display a build template or other option but don't want to spend time to compute the various build ids. --- rbm.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rbm.conf b/rbm.conf index 3996c6a..1a92588 100644 --- a/rbm.conf +++ b/rbm.conf @@ -66,5 +66,12 @@ targets: osx: 1 osname: osx-x86_64 + # The no_build_id target can be useful if you want to quickly display + # a build template or other option but don't want to spend time to + # compute the various build ids + no_build_id: + var: + build_id: 1 + docker_image: '[% pc("docker-image", "docker_save_image") %]'

1 0

[tor-messenger-build/master] Only include libstdc++.so.6 and start script on Linux
by boklm＠torproject.org 28 Nov '14

28 Nov '14

commit d9a55e86fcbb3ad6bb42213ffbfcdf053e5e9545 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 27 22:36:50 2014 +0100 Only include libstdc++.so.6 and start script on Linux --- projects/tor-messenger/build | 4 ++++ projects/tor-messenger/config | 1 + 2 files changed, 5 insertions(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 4c86230..5690fac 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -1,11 +1,15 @@ #!/bin/sh set -e tar xf [% c('input_files_by_name/instantbird') %] + +[% IF c("var/linux") %] tar xf [% c('input_files_by_name/gcc') %] chmod 755 start-tor-messenger mv start-tor-messenger instantbird/ mkdir -p instantbird/lib cp -L gcc/lib64/libstdc++.so.6 instantbird/lib/ +[% END %] + cd instantbird/extensions tar xf ../../[% c('input_files_by_name/ctypes-otr') %] mv ctypes-otr* 'ctypes-otr@tormessenger' diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 050b4aa..fee87e2 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -15,4 +15,5 @@ input_files: pkg_type: build - project: gcc name: gcc + enable: '[% c("var/linux") %]' - filename: start-tor-messenger

1 0

[tor-messenger-build/master] Fix libotr build for Windows
by boklm＠torproject.org 28 Nov '14

28 Nov '14

commit e46379af1123a9457df2105f591d7ea0b92f7ede Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 27 22:08:09 2014 +0100 Fix libotr build for Windows --- projects/libotr/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/libotr/build b/projects/libotr/build index 626ae9b..cababa2 100644 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -13,7 +13,7 @@ distdir=/tmp/dist/[% project %] tar xf libotr-[% c('version') %].tar.gz cd libotr-[% c('version') %] ./configure --prefix=$distdir [% c("var/configure_opt") %] -make -j4 +make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] make prefix=$distdir install cd /tmp/dist [% c('tar', {

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 27 Nov '14

27 Nov '14

commit 4ed34a90ab186583ad4a6a3ea93612631218a414 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 27 18:45:56 2014 +0000 Update translations for torbutton-torbuttondtd --- nn/torbutton.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nn/torbutton.dtd b/nn/torbutton.dtd index ea9e284..cc139ce 100644 --- a/nn/torbutton.dtd +++ b/nn/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Personvern- og tryggingsinnstillingar"> <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> @@ -144,14 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> -<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> +<!ENTITY torbutton.prefs.priv_caption "Personverninnstillingar"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Tryggingsnivå"> +<!ENTITY torbutton.prefs.sec_low "Låg (standard)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-låg"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-høg"> +<!ENTITY torbutton.prefs.sec_high "Høg"> +<!ENTITY torbutton.prefs.sec_custom "Sjølvvalde verdiar">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 27 Nov '14

27 Nov '14

commit 892c141df01356a23f7be1786df6a7018de5cc9f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 27 18:45:52 2014 +0000 Update translations for torbutton-torbuttonproperties --- nn/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nn/torbutton.properties b/nn/torbutton.properties index 398a748..e8dce2b 100644 --- a/nn/torbutton.properties +++ b/nn/torbutton.properties @@ -49,9 +49,9 @@ torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now -canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.notNow=Ikkje no +canvas.notNowAccessKey=I +canvas.allow=Tillat seinare canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Aldri for denne sida (tilrådd) canvas.neverAccessKey=e

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 27 Nov '14

27 Nov '14

commit 4418afdf587b4d2d5b72dfc48cbd8002d34c0f13 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 27 18:45:38 2014 +0000 Update translations for tor-launcher-network-settings --- nn/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd index 217e82e..8fc9a22 100644 --- a/nn/network-settings.dtd +++ b/nn/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "Eg vil kopla til direkte til Tor-nettverket."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve"> <!ENTITY torSettings.connect "Kopla til"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">

1 0