January 2021 - tor-commits - lists.torproject.org

[tor/master] configure: Don't print disable option for module that can't be disabled
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 8230d2ba3b9d571df4c7a425daa872d41a4f3180 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 14 09:25:46 2021 -0500 configure: Don't print disable option for module that can't be disabled This is currently for the dircache module that can not be disabled by itself, it is only disabled from the relay module. Thus, we should not print in the configure summary the disable option. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6d50dc9508..41c627021a 100644 --- a/configure.ac +++ b/configure.ac @@ -357,6 +357,12 @@ dnl --- dnl All our modules. m4_define(MODULES, relay dirauth dircache) +# Some modules are only disabled through another option. For those, we don't +# want to print the help in the summary at the end of the configure. Any entry +# in the following set will not print the "--disable-module-NAME" command in +# the summary. +m4_set_add_all([MODULES_WITH_NO_OPTIONS], [dircache]) + dnl Relay module. AC_ARG_ENABLE([module-relay], AS_HELP_STRING([--disable-module-relay], @@ -2821,7 +2827,9 @@ PPRINT_SUBTITLE([Modules]) m4_foreach_w([mname], MODULES, [ AM_COND_IF(m4_join([], [BUILD_MODULE_], m4_toupper([]mname[])), value=1, value=0) - PPRINT_PROP_BOOL([mname (--disable-module-mname)], $value) + m4_set_contains([MODULES_WITH_NO_OPTIONS], mname, + PPRINT_PROP_BOOL([mname], $value), + PPRINT_PROP_BOOL([mname (--disable-module-mname)], $value)) ] )

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/258' into maint-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit f8cf2546ea6731d6fdca6a7cfc52d047bc47bb8b Merge: e5a0c739d4 8230d2ba3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 11:59:58 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/258' into maint-0.4.5 acinclude.m4 | 4 ++-- changes/ticket33624 | 5 +++++ configure.ac | 10 +++++++++- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] configure: Don't print disable option for module that can't be disabled
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 8230d2ba3b9d571df4c7a425daa872d41a4f3180 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 14 09:25:46 2021 -0500 configure: Don't print disable option for module that can't be disabled This is currently for the dircache module that can not be disabled by itself, it is only disabled from the relay module. Thus, we should not print in the configure summary the disable option. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6d50dc9508..41c627021a 100644 --- a/configure.ac +++ b/configure.ac @@ -357,6 +357,12 @@ dnl --- dnl All our modules. m4_define(MODULES, relay dirauth dircache) +# Some modules are only disabled through another option. For those, we don't +# want to print the help in the summary at the end of the configure. Any entry +# in the following set will not print the "--disable-module-NAME" command in +# the summary. +m4_set_add_all([MODULES_WITH_NO_OPTIONS], [dircache]) + dnl Relay module. AC_ARG_ENABLE([module-relay], AS_HELP_STRING([--disable-module-relay], @@ -2821,7 +2827,9 @@ PPRINT_SUBTITLE([Modules]) m4_foreach_w([mname], MODULES, [ AM_COND_IF(m4_join([], [BUILD_MODULE_], m4_toupper([]mname[])), value=1, value=0) - PPRINT_PROP_BOOL([mname (--disable-module-mname)], $value) + m4_set_contains([MODULES_WITH_NO_OPTIONS], mname, + PPRINT_PROP_BOOL([mname], $value), + PPRINT_PROP_BOOL([mname (--disable-module-mname)], $value)) ] )

1 0

[tor/release-0.4.5] m4: Change LIBS order of TOR_SEARCH_LIBRARY()
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit c5817a0dafc67882f15730ee818fbcdba1b7b915 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 13 09:48:45 2021 -0500 m4: Change LIBS order of TOR_SEARCH_LIBRARY() Some gcc versions do explode if the order of the linker flags are not correct. One issue was statically building OpenSSL which would require that "-lssl -lcrypto" be put _before_ the "-lpthread -ldl" flags. I have not such problem with GCC 10 but does with GCC 9. Closes #33624 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- acinclude.m4 | 4 ++-- changes/ticket33624 | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 5ecdf1d5c2..e6389ea1d4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -166,7 +166,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do LDFLAGS="$tor_saved_LDFLAGS" - LIBS="$tor_saved_LIBS $3" + LIBS="$3 $tor_saved_LIBS" CPPFLAGS="$tor_saved_CPPFLAGS" if test -z "$tor_trydir" ; then @@ -219,7 +219,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ CPPFLAGS="$tor_saved_CPPFLAGS" ]) dnl end cache check -LIBS="$LIBS $3" +LIBS="$3 $LIBS" if test "$tor_cv_library_$1_dir" != "(system)"; then TOR_EXTEND_CODEPATH($tor_cv_library_$1_dir) fi diff --git a/changes/ticket33624 b/changes/ticket33624 new file mode 100644 index 0000000000..eded3b4dee --- /dev/null +++ b/changes/ticket33624 @@ -0,0 +1,5 @@ + o Minor bugfixes (configure, static build): + - Change our search library configure macro linker flag order so it works + for certain compilers that need the right order. Fixes bug 33624; bugfix + on 0.1.1.0-alpha. +

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit c38d46750e3ff4d9ed9fba68bca2f74e0608b6ff Merge: fe49a2474d f8cf2546ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:00:06 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 acinclude.m4 | 4 ++-- changes/ticket33624 | 5 +++++ configure.ac | 10 +++++++++- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 85c4087de9b80c2174e47359a5a97f5fac5c0c10 Merge: aa0c4fd86d f8cf2546ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:00:06 2021 -0500 Merge branch 'maint-0.4.5' acinclude.m4 | 4 ++-- changes/ticket33624 | 5 +++++ configure.ac | 10 +++++++++- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/258' into maint-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit f8cf2546ea6731d6fdca6a7cfc52d047bc47bb8b Merge: e5a0c739d4 8230d2ba3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 11:59:58 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/258' into maint-0.4.5 acinclude.m4 | 4 ++-- changes/ticket33624 | 5 +++++ configure.ac | 10 +++++++++- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[translation/tails-onioncircuits_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_release
by translation＠torproject.org 19 Jan '21

19 Jan '21

commit edaf664219029dcfc8daede76cc3c727898163cc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 14:17:52 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits… --- sv/onioncircuits.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/onioncircuits.po b/sv/onioncircuits.po index dfd982acea..8249576583 100644 --- a/sv/onioncircuits.po +++ b/sv/onioncircuits.po @@ -5,8 +5,8 @@ # Translators: # Anders Nilsson <anders(a)devode.se>, 2016 # Daniel Sjöberg <sjbrg(a)protonmail.com>, 2016 -# Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2016-2017 -# Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2019 +# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2016-2017 +# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 19 Jan '21

19 Jan '21

commit 144aa079b4ffe91821c56c24e565b5945393afdc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 14:17:34 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index 17d6381f23..832b7fdba8 100644 --- a/sv.po +++ b/sv.po @@ -11,9 +11,9 @@ # Henrik Mattsson-Mårn <h(a)reglage.net>, 2017 # Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2018-2019 # falk3n <johan.falkenstrom(a)gmail.com>, 2014 -# Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2017 -# Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2018-2021 -# Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2017 +# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2017 +# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2018-2021 +# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2017 # Martin H <pilino(a)posteo.de>, 2016 # 56de39dbda2b12eb73bb0082f99d9075_c272587, 2014 # ph AA, 2015 @@ -26,7 +26,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" "PO-Revision-Date: 2021-01-09 04:08+0000\n" -"Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>\n" +"Last-Translator: efef6ec5b435a041fce803c7f8af77d2_2341d43\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 19 Jan '21

19 Jan '21

commit 665c8b884352f4f2f6625f748bd08549d15abc9b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 13:47:54 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- uk/torbutton.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/uk/torbutton.properties b/uk/torbutton.properties index ff614fa6c4..a6078dd09d 100644 --- a/uk/torbutton.properties +++ b/uk/torbutton.properties @@ -95,9 +95,9 @@ onionServices.clientAuthMissing.header=Оніонсайт вимагає авт onionServices.clientAuthMissing=Доступ до оніонсайту вимагає ключа, який не надається. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +onionServices.clientAuthIncorrect.pageTitle=Авторизація невдала +onionServices.clientAuthIncorrect.header=Автентифікація оніонсайту невдала +onionServices.clientAuthIncorrect=Наданий ключ не вірний або відкликаний. Зв'яжіться з адміністратором оніонсайту. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Проблеми завантаження оніонсайту @@ -106,8 +106,8 @@ onionServices.badAddress=Вказана адреса оніонсайту нед onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Проблеми завантаження оніонсайту -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +onionServices.introTimedOut.header=Час створення ланцюжка оніонсайту вийшов +onionServices.introTimedOut=Неможливо з'єднатися з оніонсайтом, імовірно, через погане з'єднання з мережею. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address.

1 0