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

[tor/master] cov-diff: better handle the case where a file stops having coverage
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit a036c0187a7938718a1056f45ca95ddbca744b49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 11:22:55 2019 -0500 cov-diff: better handle the case where a file stops having coverage --- scripts/test/cov-diff | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/test/cov-diff b/scripts/test/cov-diff index f3ca85688..875180096 100755 --- a/scripts/test/cov-diff +++ b/scripts/test/cov-diff @@ -16,6 +16,5 @@ for B in "$DIRB"/*; do fi perl -pe 's/^\s*\!*\d+(\*?):/ 1$1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ *-:(Runs|Programs):.*//;' "$B" > "$B.tmp" diff -u "$A.tmp" "$B.tmp" |perl -pe 's/^((?:\+\+\+|---)(?:.*tmp))\s+.*/$1/;' - rm "$A.tmp" "$B.tmp" + rm -f "$A.tmp" "$B.tmp" done -

1 0

[tor/master] Merge branch 'tor-github/pr/695'
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit 59c3910becd912a18ee8e7a74c966045e7a51c80 Merge: d259194c8 a036c0187 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 20 12:15:26 2019 -0500 Merge branch 'tor-github/pr/695' changes/ticket29435 | 3 +++ changes/ticket29436 | 4 +++ scripts/test/cov-diff | 3 +-- scripts/test/cov-test-determinism.sh | 48 ++++++++++++++++++++++++++++++++++++ scripts/test/coverage | 4 +-- 5 files changed, 58 insertions(+), 4 deletions(-)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 20 Feb '19

20 Feb '19

commit 82abe1f88f92ad85e2364475bc78b36f54895158 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 17:16:23 2019 +0000 Update translations for tails-misc --- kk.po | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/kk.po b/kk.po index bc8b9d876..fb8432161 100644 --- a/kk.po +++ b/kk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-14 21:20+0100\n" -"PO-Revision-Date: 2019-02-18 17:07+0000\n" +"PO-Revision-Date: 2019-02-20 17:15+0000\n" "Last-Translator: Dinmuhamed Esengeldi <esengeldi0202(a)gmail.com>\n" "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n" "MIME-Version: 1.0\n" @@ -334,7 +334,7 @@ msgid "" "To do so, install some software using <a href=\"synaptic.desktop\">Synaptic " "Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the " "command line</a>." -msgstr "" +msgstr "Ол үшін командалық жолда <a href=\"synaptic.desktop\">Synaptic Package Manager</a> немесе <a href=\"org.gnome.Terminal.desktop\">APT арқылы кейбір бағдарламалық жасақтаманы орнатыңыз</a>." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:188 msgid "" @@ -342,81 +342,81 @@ msgid "" "some software using <a href=\"synaptic.desktop\">Synaptic Package " "Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command " "line</a>." -msgstr "" +msgstr "Мұны орындау үшін Қалдықтарды іске қосқан кезде тұрақты сақтау орныңызды ашыңыз және командалық жолда <a href=\"synaptic.desktop\">Synaptic Package Manager</a> немесе <a href=\"org.gnome.Terminal.desktop\">APT арқылы кейбір бағдарламалық жасақтаманы орнатыңыз</a>." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:198 msgid "" "To do so, create a persistent storage and install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " "href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." -msgstr "" +msgstr "Мұны істеу үшін, тұрақты сақтауды жасаңыз және командалық жолда <a href=\"synaptic.desktop\">Synaptic Package Manager</a> немесе <a href=\"org.gnome.Terminal.desktop\">APT арқылы кейбір бағдарламалық жасақтаманы орнатыңыз</a>." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:206 msgid "" "To do so, install Tails on a USB stick using <a href=\"tails-" "installer.desktop\">Tails Installer</a> and create a persistent storage." -msgstr "" +msgstr "Ол үшін <a href=\"tails-installer.desktop\">Tails Installer</a> пайдаланып, Tails USB таяқшаға орнатыңыз және тұрақты сақтау жасаңыз." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:253 msgid "[package not available]" -msgstr "" +msgstr "[пакет қол жетімді емес]" #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" -msgstr "" +msgstr "Жүйенің сағатын синхрондау" #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "" +msgstr "Tor дұрыс жұмыс істеу үшін, әсіресе, Жасырын Қызметтер үшін дұрыс сағатты қажет етеді. Өтінемін күте тұрыңыз..." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" -msgstr "" +msgstr "Сағатты синхрондау сәтсіз аяқталды!" #: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:" -msgstr "" +msgstr "Tails-дің бұл нұсқасы белгілі қауіпсіздік мәселелеріне ие:" #: config/chroot_local-includes/usr/local/bin/tails-security-check:134 msgid "Known security issues" -msgstr "" +msgstr "Белгілі қауіпсіздік мәселелері" #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "${nic} желілік картасы өшірілген" #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." -msgstr "" +msgstr "MAC спуфингі ${nic_name} желілік картасы үшін сәтсіз аяқталды (${nic}), сондықтан ол уақытша өшірілген.\nҚалдықтарды қайта іске қосуды және MAC спуфингін өшіруді қалауыңыз мүмкін." #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" -msgstr "" +msgstr "Барлық желілер өшірілген" #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." -msgstr "" +msgstr "${nic_name} желілік карта үшін MAC спуфинг сәтсіз аяқталды (${nic}). Қатені қалпына келтіру де сәтсіз болды, сондықтан барлық желілер өшірілген.\nҚалдықтарды қайта іске қосуды және MAC спуфингін өшіруді қалауыңыз мүмкін." #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110 msgid "Lock Screen" -msgstr "" +msgstr "Құлыптау экраны" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125 msgid "Screen Locker" -msgstr "" +msgstr "Экран шкафы" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131 msgid "Set up a password to unlock the screen." -msgstr "" +msgstr "Экранның құлпын ашу үшін құпия сөзді орнатыңыз." #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136 msgid "Password" @@ -437,12 +437,12 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual\"" -msgstr "" +msgstr "«Жаңартуларды тексеру үшін жад жеткіліксіз.\n\nБұл жүйенің Күштерді орындау талаптарын қанағаттандыруына көз жеткізіңіз.\nҚараңыз: file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nЖаңартуларды қайтадан тексеру үшін Қалдықтарды қайта іске қосыңыз.\n\nНемесе қолмен жаңартуды жасаңыз.\nҚараңыз https://tails.boum.org/doc/first_steps/upgrade#manual\"" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" -msgstr "" +msgstr "Қате:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 @@ -451,11 +451,11 @@ msgstr "Қате" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71 msgid "Warning: virtual machine detected!" -msgstr "" +msgstr "Ескерту: виртуалды машина анықталды!" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "Warning: non-free virtual machine detected!" -msgstr "" +msgstr "Ескерту: тегін емес виртуалды машина анықталды!" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:77 msgid "" @@ -463,7 +463,7 @@ msgid "" "monitor what you are doing in Tails. Only free software can be considered " "trustworthy, for both the host operating system and the virtualization " "software." -msgstr "" +msgstr "Хосттың операциялық жүйесі және виртуалдандыру бағдарламалық қамтамасыз етуі Tails не істеп жатқанын бақылай алады. Тек қана тегін бағдарламалық жасақтаманы хост операциялық жүйесі мен виртуалдандыру бағдарламалық жасақтамасы үшін сенімді деп санауға болады." #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:81 msgid "Learn more" @@ -471,27 +471,27 @@ msgstr "Толық оқу" #: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Tor is not ready" -msgstr "" +msgstr "Tor дайын емес" #: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "" +msgstr "Tor дайын емес.Tor браузеін кез келген уақытта іске қосыңыз" #: config/chroot_local-includes/usr/local/bin/tor-browser:45 msgid "Start Tor Browser" -msgstr "" +msgstr "Tor браузерін бастау" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:40 msgid "Tor" -msgstr "" +msgstr "Tor" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:55 msgid "Open Onion Circuits" -msgstr "" +msgstr "Onion тізбектерін ашу" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "" +msgstr "Шын мәнінде Шолғышты іске қосқыңыз келе ме?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid ""

1 0

[tor/master] Cleanup shellcheck warnings in autogen.sh
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit 88818eacbdcbdd1fddb3452c3eddf8fba3f26e9c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jan 18 13:49:30 2019 +0200 Cleanup shellcheck warnings in autogen.sh --- autogen.sh | 5 +++-- changes/ticket26069 | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 276dd4047..63ef6d49e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,9 +1,9 @@ #!/bin/sh -if [ -x "`which autoreconf 2>/dev/null`" ] ; then +if command -v autoreconf; then opt="-i -f -W all,error" - for i in $@; do + for i in "$@"; do case "$i" in -v) opt="${opt} -v" @@ -11,6 +11,7 @@ if [ -x "`which autoreconf 2>/dev/null`" ] ; then esac done + # shellcheck disable=SC2086 exec autoreconf $opt fi diff --git a/changes/ticket26069 b/changes/ticket26069 new file mode 100644 index 000000000..caed9be34 --- /dev/null +++ b/changes/ticket26069 @@ -0,0 +1,2 @@ + o Code simplification and refactoring (shell scripts): + - Cleanup autogen.sh to silence shellcheck warnings. Closes ticket 26069.

1 0

[tor/master] Merge branch 'tor-github/pr/687'
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit da179088ee1e687d154e60342cefb6c6080fcc15 Merge: 7037fe116 8df6a65e6 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 20 12:09:02 2019 -0500 Merge branch 'tor-github/pr/687' changes/ticket29068 | 2 ++ src/test/zero_length_keys.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/master] Fix shellcheck warning in zero_length_keys.sh
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit 8df6a65e6b86be70ab1d7f57b097913068ace72c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Feb 7 17:22:06 2019 +0200 Fix shellcheck warning in zero_length_keys.sh --- changes/ticket29068 | 2 ++ src/test/zero_length_keys.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/ticket29068 b/changes/ticket29068 new file mode 100644 index 000000000..77ef304f1 --- /dev/null +++ b/changes/ticket29068 @@ -0,0 +1,2 @@ + o Code simplification and refactoring (shell scripts): + - Fix shellcheck warnings in zero_length_keys.sh. Resolves issue 29068. diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh index 3c61f8d46..4069148e0 100755 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@ -19,7 +19,7 @@ # 3: a command failed - the test could not be completed # -if [ $# -eq 0 ] || [ ! -f ${1} ] || [ ! -x ${1} ]; then +if [ $# -eq 0 ] || [ ! -f "${1}" ] || [ ! -x "${1}" ]; then echo "Usage: ${0} PATH_TO_TOR [-z|-d|-e]" exit 1 elif [ $# -eq 1 ]; then @@ -31,7 +31,7 @@ else #[$# -gt 1 ]; then shift fi -DATA_DIR=`mktemp -d -t tor_zero_length_keys.XXXXXX` +DATA_DIR=$(mktemp -d -t tor_zero_length_keys.XXXXXX) if [ -z "$DATA_DIR" ]; then echo "Failure: mktemp invocation returned empty string" >&2 exit 3 @@ -40,7 +40,7 @@ if [ ! -d "$DATA_DIR" ]; then echo "Failure: mktemp invocation result doesn't point to directory" >&2 exit 3 fi -trap "rm -rf '$DATA_DIR'" 0 +trap 'rm -rf "$DATA_DIR"' 0 touch "$DATA_DIR"/empty_torrc

1 0

[tor/master] Merge branch 'tor-github/pr/658'
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit d259194c8275f15585189d90ef41d6685eb16da4 Merge: da179088e 88818eacb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 20 12:09:52 2019 -0500 Merge branch 'tor-github/pr/658' autogen.sh | 5 +++-- changes/ticket26069 | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Use setrlimit instead of ulimit -c in backtrace tests
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit b7ad8bcaad093a5d043c63f30c196c52741830d2 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Feb 13 15:50:09 2019 +0200 Use setrlimit instead of ulimit -c in backtrace tests --- changes/bug29061 | 4 ++++ src/test/test_bt.sh | 2 -- src/test/test_bt_cl.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/bug29061 b/changes/bug29061 new file mode 100644 index 000000000..58fc4f22e --- /dev/null +++ b/changes/bug29061 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Call setrlimit() to disable core dumps in test_bt_cl.c instead of + using `ulimit -c` in test_bt.sh, which violates POSIX shell + compatibility. Fixes bug 29061; bugfix on 0.3.5.1-alpha. diff --git a/src/test/test_bt.sh b/src/test/test_bt.sh index df8bcb8ed..312905a4e 100755 --- a/src/test/test_bt.sh +++ b/src/test/test_bt.sh @@ -3,8 +3,6 @@ exitcode=0 -ulimit -c 0 - export ASAN_OPTIONS="handle_segv=0:allow_user_segv_handler=1" "${builddir:-.}/src/test/test-bt-cl" backtraces || exit $? "${builddir:-.}/src/test/test-bt-cl" assert 2>&1 | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 0c15a02ee..08b08ba42 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -4,6 +4,9 @@ #include "orconfig.h" #include <stdio.h> #include <stdlib.h> +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif /* To prevent 'assert' from going away. */ #undef TOR_COVERAGE @@ -88,6 +91,11 @@ main(int argc, char **argv) return 1; } +#ifdef HAVE_SYS_RESOURCE_H + struct rlimit rlim = { .rlim_cur = 0, .rlim_max = 0 }; + setrlimit(RLIMIT_CORE, &rlim); +#endif + #if !(defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \ defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)) puts("Backtrace reporting is not supported on this platform");

1 0

[tor/master] Merge branch 'tor-github/pr/700'
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit 7037fe116359a9424cb6a20d88f38c0a422ebd68 Merge: 8f5a3c046 b7ad8bcaa Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 20 12:06:39 2019 -0500 Merge branch 'tor-github/pr/700' changes/bug29061 | 4 ++++ src/test/test_bt.sh | 2 -- src/test/test_bt_cl.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-)

1 0

[tor/master] Warn about missing ContactInfo when MyFamily set
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit cb1072790f17cd43787a41c04b36a24833fbf7ee Author: José M. Guisado <guigom(a)riseup.net> Date: Thu Jan 31 13:27:42 2019 +0100 Warn about missing ContactInfo when MyFamily set Operators should be warned when setting MyFamily in addition to missing ContactInfo Signed-off-by: José M. Guisado <guigom(a)riseup.net> --- changes/ticket25110 | 4 ++++ src/app/config/config.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/ticket25110 b/changes/ticket25110 new file mode 100644 index 000000000..298e33287 --- /dev/null +++ b/changes/ticket25110 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging, configuration): + - Warn operators when MyFamily option is set but ContactInfo + is missing, as the latter should be set too. + Fixes bug 25110; bugfix on 0.3.3.1-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 952b9cd30..6b9162a3d 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4179,6 +4179,10 @@ options_validate(or_options_t *old_options, or_options_t *options, "You should also make sure you aren't listing this bridge's " "fingerprint in any other MyFamily."); } + if (options->MyFamily_lines && !options->ContactInfo) { + log_warn(LD_CONFIG, "MyFamily is set but ContactInfo is not configured. " + "ContactInfo should always be set when MyFamily option is too."); + } if (normalize_nickname_list(&options->MyFamily, options->MyFamily_lines, "MyFamily", msg)) return -1;

1 0