- tor-commits - lists.torproject.org

[tor/release-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit db112329a0358a8e9138c782ee48c5e3f3d1f35d Merge: 44e105c27f f20f5a4e37 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:35:35 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 04886b339331e0e5e9daebb2acd54dc5ffa8fb9b Merge: d4c697b2f7 fdc7549b61 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:36:07 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 46de5eb054cfdcedad0f7971d9a0defbd5e21db0 Merge: a9913435bc 5a043825d0 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:36:06 2021 +0000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit fdc7549b61443a1ffd723c5a497b9c96c78d4a1a Merge: d949a2f924 5a043825d0 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:36:06 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.5] Stop calling evdns_set_random_bytes_fn()
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit f20f5a4e376d254e069fed66a321bc9cdd537096 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 16 17:26:59 2021 -0400 Stop calling evdns_set_random_bytes_fn() This function has been a no-op since Libevent 2.0.4-alpha, when libevent got an arc4random() implementation. Libevent has finally removed it, which will break our compilation unless we stop calling it. (This is currently breaking compilation in OSS-fuzz.) Closes #40371. --- changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug40371 b/changes/bug40371 new file mode 100644 index 0000000000..8cc7117f9f --- /dev/null +++ b/changes/bug40371 @@ -0,0 +1,6 @@ + o Minor bugfixes (compatibility): + - Fix compatibility with the most recent Libevent versions, which + no longer have an evdns_set_random_bytes() function. Because + this function has been a no-op since Libevent 2.0.4-alpha, + it is safe for us to just stop calling it. Fixes bug 40371; + bugfix on 0.2.1.7-alpha. diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index e20a39482f..075d7d7063 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -224,7 +224,6 @@ int dns_init(void) { init_cache_map(); - evdns_set_random_bytes_fn(dns_randfn_); if (server_mode(get_options())) { int r = configure_nameservers(1); return r;

1 0

[tor/release-0.4.5] Remove unused function: dns_randfn_() in dns.c.
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 5a043825d0b208343da4864ec9e071118b83cd06 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 10 13:07:24 2021 +0000 Remove unused function: dns_randfn_() in dns.c. This patch unbreaks the current build after tor!369 landed. See: https://bugs.torproject.org/tpo/core/tor/40371 --- src/feature/relay/dns.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 075d7d7063..49ed8bd790 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -211,14 +211,6 @@ evdns_log_cb(int warn, const char *msg) tor_log(severity, LD_EXIT, "eventdns: %s", msg); } -/** Helper: passed to eventdns.c as a callback so it can generate random - * numbers for transaction IDs and 0x20-hack coding. */ -static void -dns_randfn_(char *b, size_t n) -{ - crypto_rand(b,n); -} - /** Initialize the DNS subsystem; called by the OR process. */ int dns_init(void)

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit db112329a0358a8e9138c782ee48c5e3f3d1f35d Merge: 44e105c27f f20f5a4e37 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:35:35 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[donate-static/staging] new gitlabci
by emmapeel＠torproject.org 20 Oct '21

20 Oct '21

commit f6cb46cbb0b361203a7af41ca494828cbf6fd73a Author: emma peel <emma.peel(a)riseup.net> Date: Wed Oct 20 19:23:02 2021 +0200 new gitlabci --- .gitlab-ci.yml | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..16951072 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,118 @@ +image: debian:buster-slim + + +# This template should be usable on any system that's based on apt. +# taken from tor gitlabci + +.apt-template: &apt-template | + export LC_ALL=C.UTF-8 + echo Etc/UTC > /etc/timezone + mkdir -p apt-cache + export APT_CACHE_DIR="$(pwd)/apt-cache" + echo 'quiet "1";' \ + 'APT::Install-Recommends "0";' \ + 'APT::Install-Suggests "0";' \ + 'APT::Acquire::Retries "20";' \ + 'APT::Get::Assume-Yes "true";' \ + 'Dpkg::Use-Pty "0";' \ + "Dir::Cache::Archives \"${APT_CACHE_DIR}\"; " \ + >> /etc/apt/apt.conf.d/99gitlab + apt-get update -qq + apt-get upgrade -qy + +variables: + GIT_SUBMODULE_STRATEGY: recursive + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + TRANSLATION_BRANCH: "donate-static-contentspot" + + +stages: + - build + - test_l10n + +pages: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - .cache/pip + - .cache/lektor/builds/ + stage: build + script: + - *apt-template + - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector apt-utils ca-certificates -y + - pip3 install virtualenv + - virtualenv venv + - source venv/bin/activate + - pip3 install lektor + - echo 'checking out translations' + - rm -rf i18n + - git clone --branch $TRANSLATION_BRANCH https://git.torproject.org/translation.git i18n + - echo 'reinstall lektor plugins' + - lektor project-info --output-path + - lektor plugins reinstall + - echo 'building lektor 3 more times to get translations in place' + - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public + artifacts: + paths: + - public + - i18n + rules: + - when: always + +check_new_strings: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - .cache/pip + + stage: test_l10n + needs: [pages] + allow_failure: true + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH + - if: '$CI_COMMIT_BRANCH == "translations"' + when: never + - changes: + - content/**/*.lr + - templates/**/* + script: + - *apt-template + - DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev python3-setuptools i18nspector python3-polib python3-requests ca-certificates apt-utils -y + - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - echo 'lets see if there are any updates in the strings for translation' + - l10n/bin/check_po_status.py $TRANSLATION_BRANCH + artifacts: + paths: + - public + - i18n + - l10n + +check_l10n: + allow_failure: true + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - i18n + - .cache/pip + stage: test_l10n + needs: [pages] + only: + - translations + script: + - DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector python3-polib ca-certificates -y + - echo 'lets see if there are any broken links on the translations' + - l10n/bin/check_markdown_links.py i18n/ +

1 0

[donate-static/master] new gitlabci
by emmapeel＠torproject.org 20 Oct '21

20 Oct '21

commit 4b2c7e7d6e6010e1e470a10257eef1830dbda59a Author: emma peel <emma.peel(a)riseup.net> Date: Wed Oct 20 19:23:02 2021 +0200 new gitlabci --- .gitlab-ci.yml | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..16951072 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,118 @@ +image: debian:buster-slim + + +# This template should be usable on any system that's based on apt. +# taken from tor gitlabci + +.apt-template: &apt-template | + export LC_ALL=C.UTF-8 + echo Etc/UTC > /etc/timezone + mkdir -p apt-cache + export APT_CACHE_DIR="$(pwd)/apt-cache" + echo 'quiet "1";' \ + 'APT::Install-Recommends "0";' \ + 'APT::Install-Suggests "0";' \ + 'APT::Acquire::Retries "20";' \ + 'APT::Get::Assume-Yes "true";' \ + 'Dpkg::Use-Pty "0";' \ + "Dir::Cache::Archives \"${APT_CACHE_DIR}\"; " \ + >> /etc/apt/apt.conf.d/99gitlab + apt-get update -qq + apt-get upgrade -qy + +variables: + GIT_SUBMODULE_STRATEGY: recursive + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + TRANSLATION_BRANCH: "donate-static-contentspot" + + +stages: + - build + - test_l10n + +pages: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - .cache/pip + - .cache/lektor/builds/ + stage: build + script: + - *apt-template + - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector apt-utils ca-certificates -y + - pip3 install virtualenv + - virtualenv venv + - source venv/bin/activate + - pip3 install lektor + - echo 'checking out translations' + - rm -rf i18n + - git clone --branch $TRANSLATION_BRANCH https://git.torproject.org/translation.git i18n + - echo 'reinstall lektor plugins' + - lektor project-info --output-path + - lektor plugins reinstall + - echo 'building lektor 3 more times to get translations in place' + - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public + artifacts: + paths: + - public + - i18n + rules: + - when: always + +check_new_strings: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - .cache/pip + + stage: test_l10n + needs: [pages] + allow_failure: true + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH + - if: '$CI_COMMIT_BRANCH == "translations"' + when: never + - changes: + - content/**/*.lr + - templates/**/* + script: + - *apt-template + - DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev python3-setuptools i18nspector python3-polib python3-requests ca-certificates apt-utils -y + - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - echo 'lets see if there are any updates in the strings for translation' + - l10n/bin/check_po_status.py $TRANSLATION_BRANCH + artifacts: + paths: + - public + - i18n + - l10n + +check_l10n: + allow_failure: true + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - i18n + - .cache/pip + stage: test_l10n + needs: [pages] + only: + - translations + script: + - DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector python3-polib ca-certificates -y + - echo 'lets see if there are any broken links on the translations' + - l10n/bin/check_markdown_links.py i18n/ +

1 0

[torbutton/master] Merge remote-tracking branch 'richardgl/yec_background'
by sysrqb＠torproject.org 20 Oct '21

20 Oct '21

commit c6cd775702a6e363635cafc0aed5d105380a5304 Merge: 36c26916 d4604f60 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 20 17:18:51 2021 +0000 Merge remote-tracking branch 'richardgl/yec_background' chrome/skin/yec-activist.svg | 187 ++++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 93 deletions(-)

1 0