September 2020 - tor-commits - lists.torproject.org

[tor-browser-build/master] Bug 40052: Bump NSIS to 3.06.1
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit 1e1d42ffe955803ac13dc1e95e7bae1a29a7dd7b Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 6 17:43:01 2020 +0000 Bug 40052: Bump NSIS to 3.06.1 It seems our timestamp related patch is not needed anymore as building the .exe files twice without it gives the exact same result. --- projects/nsis/build | 5 ----- projects/nsis/config | 5 ++--- projects/nsis/no-insert-timestamp.patch | 27 --------------------------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/projects/nsis/build b/projects/nsis/build index c6a6d3e..54287db 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -8,11 +8,6 @@ tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] cd /var/tmp/build/nsis-[% c('version') %]-src -# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it -# is used for both the host and cross-compiled parts, but this option is -# only valid for the Windows linker. Therefore we add it using a patch -# to the cross-compilation part only. -patch -p1 < $rootdir/no-insert-timestamp.patch [% IF c("var/windows-x86_64") %] # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp diff --git a/projects/nsis/config b/projects/nsis/config index ed9823d..36f29e2 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.05 +version: 3.06.1 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -16,8 +16,7 @@ input_files: - project: container-image - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' - sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9 - - filename: no-insert-timestamp.patch + sha256sum: 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0 - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: zlib diff --git a/projects/nsis/no-insert-timestamp.patch b/projects/nsis/no-insert-timestamp.patch deleted file mode 100644 index 8053b82..0000000 --- a/projects/nsis/no-insert-timestamp.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur nsis-3.03-src/SCons/Config/gnu nsis-3.03-src.n/SCons/Config/gnu ---- nsis-3.03-src/SCons/Config/gnu 2017-10-06 15:30:20.000000000 -0400 -+++ nsis-3.03-src.n/SCons/Config/gnu 2018-06-17 13:26:05.945495151 -0400 -@@ -102,6 +102,7 @@ - stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no standard libraries - stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align - stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file -+stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - stub_uenv = stub_env.Clone() - stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -@@ -142,6 +143,7 @@ - plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file - plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency - plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency -+plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - plugin_uenv = plugin_env.Clone() - plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -@@ -181,6 +183,7 @@ - - util_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables - util_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align -+util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - - conf = FlagsConfigure(util_env)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40052_v2'
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit dc1c7038f4d7cbb37b00bbbeb29667c069018a1f Merge: 3aef0b0 1e1d42f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 10 15:46:18 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40052_v2' projects/nsis/build | 5 ----- projects/nsis/config | 5 ++--- projects/nsis/no-insert-timestamp.patch | 27 --------------------------- 3 files changed, 2 insertions(+), 35 deletions(-)

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit febca57a95b12a0b036af369c0838d49cd10c787 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 15:45:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- id/LC_MESSAGES/bridgedb.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 43d553f9b7..1c36493ad7 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -26,7 +26,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-09-10 15:14+0000\n" +"PO-Revision-Date: 2020-09-10 15:43+0000\n" "Last-Translator: Ridhwan Ikhwanto\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" @@ -98,21 +98,21 @@ msgstr "Kode QR untuk jembatan Anda" #: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." -msgstr "Tampaknya ada galat kesalahan dalam mendapatkan QRCode Anda." +msgstr "Tampaknya ada kesalahan dalam mendapatkan Kode QR Anda." #: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "QRCode ini berisi garis jembatan Anda. Pindai dengan pembaca QRCode untuk salin garis jembatan Anda ke perangkat seluler dan lainnya." +msgstr "Kode QR ini berisi baris jembatan Anda. Pindai dengan pembaca Kode QR untuk menyalin baris jembatan Anda ke perangkat seluler dan lainnya." #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB mengalami sebuah kesalahan." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." -msgstr "Belum ada bridge yang tersedia..." +msgstr "Belum ada jembatan yang tersedia..." #: bridgedb/distributors/https/templates/bridges.html:118 #: bridgedb/distributors/https/templates/bridges.html:122 @@ -141,7 +141,7 @@ msgstr "Langkah %s2%s" #: bridgedb/distributors/https/templates/index.html:30 #, python-format msgid "Get %s bridges %s" -msgstr "Dapatkan %s bridge %s" +msgstr "Dapatkan %s jembatan %s" #: bridgedb/distributors/https/templates/index.html:40 #, python-format @@ -152,7 +152,7 @@ msgstr "Langkah %s3%s" #: bridgedb/distributors/https/templates/index.html:47 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s" +msgstr "Sekarang %s tambahkan jembatan ke Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -161,7 +161,7 @@ msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s" #: bridgedb/distributors/https/templates/options.html:42 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sB%serikan saya bridge!" +msgstr "%sB%serikan saya jembatan!" #: bridgedb/distributors/https/templates/options.html:55 msgid "Advanced Options" @@ -193,7 +193,7 @@ msgstr "%sD%sapatkan Jembatan!" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[Ini adalah surel otomatis]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -210,7 +210,7 @@ msgstr "Anda telah melampaui batas yang ditetapkan. Mohon perlambat! Waktu jeda msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "Jika jembatan-jembatan ini bukan yang Anda butuhkan, jawab surel ini dengan salah satu perintah berikut di isi pesan:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -224,7 +224,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun melihat lalu lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n" +msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun yang melihat lalu-lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:57 @@ -269,7 +269,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "" +msgstr "Cara lain untuk mendapatkan jembatan adalah dengan mengirim sebuah surel ke %s. Biarkan Perihal surel\nkosong dan tulis \"get transport obfs4\" di isi pesan surel. Harap catat\nbahwa Anda harus mengirim surel menggunakan alamat dari salah satu dari penyedia surel\nberikut: %s atau %s." #: bridgedb/strings.py:94 msgid "My bridges don't work! I need help!" @@ -282,7 +282,7 @@ msgstr "Jembatan saya tidak bekerja! Saya butuh bantuan!" #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." -msgstr "Jika Peramban Tor anda tidak dapat terhubung, harap lihat pada %s dan %skami." +msgstr "Jika Tor Browser Anda tidak dapat terhubung, harap kunjungi %s dan %skami." #: bridgedb/strings.py:102 msgid "Here are your bridge lines:" @@ -294,7 +294,7 @@ msgstr "Dapatkan Jembatan!" #: bridgedb/strings.py:107 msgid "Bridge distribution mechanisms" -msgstr "" +msgstr "Mekanisme penyaluran jembatan" #. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". #: bridgedb/strings.py:109 @@ -305,7 +305,7 @@ msgid "" "the pseudo-mechanism \"None\". The following list briefly explains how these\n" "mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" "mechanisms is." -msgstr "" +msgstr "BridgeDB memiliki empat mekanisme untuk menyalurkan jembatan: \"HTTPS\", \"Moat\"\n\"Surel\" dan \"Telah Direservasi\". Jembatan yang tidak disalurkan melalui BridgeDB menggunakan\npseudo-mekanisme \"Tidak Ada\". Daftar berikut sedikit menjelaskan bagaimana\nmekanisme-mekanisme ini bekerja dan %smetrik BridgeDB%s memvisualisasikan kepopuleran masing-masing mekanisme." #: bridgedb/strings.py:115 #, python-format

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40072'
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit 3aef0b0a63aaab19d2318b17a6973874e06cd842 Merge: 7e49b0e df7f1b0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 10 15:15:51 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40072' projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 40072: Pick up the dependency changes due to fenix#40001
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit df7f1b01d6ac61df5ed5095243a4eaf9d3d94c63 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 4 19:14:10 2020 +0000 Bug 40072: Pick up the dependency changes due to fenix#40001 --- projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/fenix/config b/projects/fenix/config index 33d4e44..034714f 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -14,7 +14,7 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 3 + gradle_dependencies_version: 4 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 4957902..bf237cb 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -565,6 +565,8 @@ fbd052d2d4cd16f707547c468621c6b7fb842c7ec8866d012ecbc6178de1f394 | https://jcent 6f59f847f37a7a052243e97a3b24d6e834833fca3a48d6980f96f7779fe5ff98 | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-agent/1.9.7/byte-buddy… 93d9d380779cd1768c52b4bcee82cbfaedef9a4a30de87ae06b441e1634fd38c | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-parent/1.10.9/byte-bud… 259079927014348a555c0969dbae9339c3cc33895a05ffec8e0a25dd50c82278 | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-parent/1.9.7/byte-budd… +ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… +3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.aar 0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.jar aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.pom @@ -868,9 +870,11 @@ d445923ab7dfbb93d086b070b64f07495b0a1804b9ce1f51815d6034c31f781a | https://jcent 9ebcfff0b872eaeeae47b2a9f9653c4e40041193a7c16e6a774f73d79aca8b57 | https://jcenter.bintray.com/org/robolectric/utils/4.3.1/utils-4.3.1.pom 9d7bf2557947d44d6f3ed76ec5231e8b72e33eb61c65ac9e149ad307b0eb936c | https://jcenter.bintray.com/org/robolectric/utils-reflector/4.3.1/utils-ref… a04c2bdefec0b5b492de86365e49537df6d39b04f3823619c94ba2b8937d8670 | https://jcenter.bintray.com/org/robolectric/utils-reflector/4.3.1/utils-ref… -baf3c7fe15fefeaf9e5b000d94547379dc48370f22a8797e239c127e7d7756ec | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.jar -d7a15266d22fadc1c81bbc3b62637801d116e484eb6c831217dc36c537be48d2 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.pom -36367d127a586d502b60bf54db2d7397ec94573620eff523873ec12a12e54839 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.24/slf4j-parent-1.7.… +fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.… +bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.… +18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar +7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom +18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.… c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/4/oss-parent-4.pom b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit 414711756a94acd5b11796b7dbdb911edb7e2bab Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 15:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- id/LC_MESSAGES/bridgedb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 4f97925249..43d553f9b7 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -4,7 +4,7 @@ # # Translators: # anzhyo, 2014 -# Astryd Viandila Dahlan, 2015 +# f952c994a186aafe51026d7b069e8fbe_4f82a74, 2015 # cholif yulian <cholifyulian123(a)gmail.com>, 2015 # constantius damar wicaksono <constantiusdamar(a)gmail.com>, 2015 # wongcie <dwexz_cie(a)yahoo.com>, 2015 @@ -16,6 +16,7 @@ # L1Nus <multazam_ali(a)me.com>, 2014 # Ngalim Siregar <ngalim.siregar(a)gmail.com>, 2015 # km242saya <pencurimangga(a)gmail.com>, 2014 +# Ridhwan Ikhwanto, 2020 # Suryadi Harun <suryadiharun08(a)gmail.com>, 2019 # Wahyu Utomo Nurindrayanto <wahyutomo66(a)gmail.com>, 2016 # Yerry Borang <yerry.borang(a)gmail.com>, 2019 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-09-10 15:14+0000\n" +"Last-Translator: Ridhwan Ikhwanto\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,7 +82,7 @@ msgstr "Kode Sumber" #: bridgedb/distributors/https/templates/base.html:100 msgid "Changelog" -msgstr "Perubahan" +msgstr "Catatan Perubahan" #: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" @@ -93,7 +94,7 @@ msgstr "Tampilkan QRCode" #: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QRCode untuk bridge Anda" +msgstr "Kode QR untuk jembatan Anda" #: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode."

1 0

[tor/master] Check if glob() is available at build-time.
by dgoulet＠torproject.org 10 Sep '20

10 Sep '20

commit 1c4b140427aeb36d80475e92fe57154fcc8abcf3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Sep 9 22:08:54 2020 +0000 Check if glob() is available at build-time. This patch disables the glob() support in the path library if glob() is unavailable at build-time. This currently happens with the Android NDK used for Tor Browser. See: https://bugs.torproject.org/tpo/core/tor/40114 --- configure.ac | 2 ++ src/lib/fs/path.c | 15 ++++++++++----- src/test/test_util.c | 12 ++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2e1de76606..74f2379fca 100644 --- a/configure.ac +++ b/configure.ac @@ -845,6 +845,8 @@ fi AM_CONDITIONAL(BUILD_READPASSPHRASE_C, test "x$ac_cv_func_readpassphrase" = "xno" && test "$bwin32" = "false") +AC_CHECK_FUNCS(glob) + AC_MSG_CHECKING([whether free(NULL) works]) AC_RUN_IFELSE([AC_LANG_PROGRAM([ #include <stdlib.h> diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index f03cecf52d..1a15969419 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -532,7 +532,7 @@ unglob_win32(const char *pattern, int prev_sep, int next_sep) tor_free(path_until_glob); return result; } -#else /* !defined(_WIN32) */ +#elif HAVE_GLOB /** Same as opendir but calls sandbox_intern_string before */ static DIR * prot_opendir(const char *name) @@ -559,7 +559,7 @@ wrap_closedir(void *arg) { closedir(arg); } -#endif /* defined(_WIN32) */ +#endif /* defined(HAVE_GLOB) */ /** Return a new list containing the paths that match the pattern * <b>pattern</b>. Return NULL on error. On POSIX systems, errno is set by the @@ -568,14 +568,15 @@ wrap_closedir(void *arg) struct smartlist_t * tor_glob(const char *pattern) { - smartlist_t *result; + smartlist_t *result = NULL; + #ifdef _WIN32 // PathMatchSpec does not support forward slashes, change them to backslashes char *pattern_normalized = tor_strdup(pattern); tor_strreplacechar(pattern_normalized, '/', *PATH_SEPARATOR); result = get_glob_paths(pattern_normalized, unglob_win32, true); tor_free(pattern_normalized); -#else /* !(defined(_WIN32)) */ +#elif HAVE_GLOB /* !(defined(_WIN32)) */ glob_t matches; int flags = GLOB_ERR | GLOB_NOSORT; #ifdef GLOB_ALTDIRFUNC @@ -608,7 +609,11 @@ tor_glob(const char *pattern) smartlist_add(result, match); } globfree(&matches); -#endif /* defined(_WIN32) */ +#else + (void)pattern; + return result; +#endif /* !defined(HAVE_GLOB) */ + return result; } diff --git a/src/test/test_util.c b/src/test/test_util.c index 0e2550d5c5..3ce7103ade 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4440,6 +4440,7 @@ test_util_glob(void *ptr) { (void)ptr; +#ifdef HAVE_GLOB smartlist_t *results = NULL; int r, i; char *dir1 = NULL, *dir2 = NULL, *forbidden = NULL, *dirname = NULL; @@ -4656,6 +4657,11 @@ test_util_glob(void *ptr) SMARTLIST_FOREACH(results, char *, f, tor_free(f)); smartlist_free(results); } +#else + tt_skip(); + done: + return; +#endif } static void @@ -4663,6 +4669,7 @@ test_util_get_glob_opened_files(void *ptr) { (void)ptr; +#ifdef HAVE_GLOB smartlist_t *results = NULL; int r, i; char *dir1 = NULL, *dir2 = NULL, *forbidden = NULL, *dirname = NULL; @@ -4843,6 +4850,11 @@ test_util_get_glob_opened_files(void *ptr) SMARTLIST_FOREACH(results, char *, f, tor_free(f)); smartlist_free(results); } +#else + tt_skip(); + done: + return; +#endif } static void

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit 0a2fb1d66c40323c21165d3495e607d07f565ac5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 13:15:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- da/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 52f3f65ede..c8b3b30e51 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -47,6 +47,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere bemærkede at du navigerede til en side som ikke bruger HTTPS, og prøvede i stedet at sende dig til HTTPS-versionen. HTTPS-versionen er ikke tilgængelig. Stedet understøtter højst sandsynligt ikke HTTPS, men der er også mulighed for at en angriber blokerer HTTPS-versionen. Hvis du ønsker at vise den ukrypterede version af siden, så kan du stadig gøre det ved at deaktivere valgmuligheden 'Kryptér alle steder kvalificeret (EASE)' i din HTTPS Everywhere-udvidelse. Vær opmærksom på at deaktivering af valgmuligheden kan gøre din browser sårbar overfor netværksbaserede nedgraderingsangreb på de websteder du besøger."> <!ENTITY https-everywhere.cancel.he_blocking_network "netværksbaserede nedgraderingsangreb"> +<!ENTITY https-everywhere.cancel.copy_url "Kopiér URL"> +<!ENTITY https-everywhere.cancel.copied_url "Kopieret til udklipsholder"> <!ENTITY https-everywhere.cancel.open_page "Åbn usikker side"> <!ENTITY https-everywhere.cancel.http_once "Åbn usikker side, kun i denne session">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit 490546e749dccb8aa2d1e5c8cf8aee8c4c54fd44 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 13:15:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- da/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 327f85571c..c8b3b30e51 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -47,8 +47,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere bemærkede at du navigerede til en side som ikke bruger HTTPS, og prøvede i stedet at sende dig til HTTPS-versionen. HTTPS-versionen er ikke tilgængelig. Stedet understøtter højst sandsynligt ikke HTTPS, men der er også mulighed for at en angriber blokerer HTTPS-versionen. Hvis du ønsker at vise den ukrypterede version af siden, så kan du stadig gøre det ved at deaktivere valgmuligheden 'Kryptér alle steder kvalificeret (EASE)' i din HTTPS Everywhere-udvidelse. Vær opmærksom på at deaktivering af valgmuligheden kan gøre din browser sårbar overfor netværksbaserede nedgraderingsangreb på de websteder du besøger."> <!ENTITY https-everywhere.cancel.he_blocking_network "netværksbaserede nedgraderingsangreb"> -<!ENTITY https-everywhere.cancel.copy_url "Copy URL"> -<!ENTITY https-everywhere.cancel.copied_url "Copied to Clipboard"> +<!ENTITY https-everywhere.cancel.copy_url "Kopiér URL"> +<!ENTITY https-everywhere.cancel.copied_url "Kopieret til udklipsholder"> <!ENTITY https-everywhere.cancel.open_page "Åbn usikker side"> <!ENTITY https-everywhere.cancel.http_once "Åbn usikker side, kun i denne session">

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 10 Sep '20

10 Sep '20

commit f4e3f6862e654fcb34d68cac672a954dcb2d0027 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 10 12:45:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- fr/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 96403dbb48..80f63deed7 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -47,6 +47,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS partout a remarqué que vous naviguiez vers une page non HTTPS et a tenté de plutôt vous envoyer vers la version HTTPS. La version HTTPS n’est pas proposée. Ce site ne prend probablement pas HTTPS en charge, mais il est aussi possible qu’un assaillant bloque la version HTTPS. Si vous souhaitez visualiser la version non chiffrée de cette page, vous pouvez quand même le faire en désactivant l’option « Chiffrer tous les sites admissibles (CTSA) » dans votre extension HTTPS partout. Sachez que la désactivation de cette option peut rendre votre navigateur vulnérable aux attaques réseau par déclassement contre les sites Web que vous visitez."> <!ENTITY https-everywhere.cancel.he_blocking_network "attaques de rétrograde réseau"> +<!ENTITY https-everywhere.cancel.copy_url "Copier l’URL"> +<!ENTITY https-everywhere.cancel.copied_url "A été copié vers le presse-papiers"> <!ENTITY https-everywhere.cancel.open_page "Ouvrir la page non sécurisée"> <!ENTITY https-everywhere.cancel.http_once "N’ouvrir la page non sécurisée que pour cette session">

1 0