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

[tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor <teor(a)torproject.org> Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++++++--- changes/ticket32500 | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" + ## We check NSS + ## NSS is a fast job, clang is slower on Linux, so we do NSS clang + - env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi

1 0

[tor/maint-0.3.5] Travis: use -std=gnu99 with NSS, and clang with Chutney
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor <teor(a)torproject.org> Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS - ## NSS is a fast job, clang is slower on Linux, so we do NSS clang - - env: NSS_OPTIONS="--enable-nss" - compiler: clang - ## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" + - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" + ## We run chutney on Linux, because it's faster than chutney on macOS + ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240.

1 0

[tor/maint-0.3.5] Travis: use -std=gnu99 in some jobs
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor <teor(a)torproject.org> Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++++++--- changes/ticket32500 | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 000000000..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: + - Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500.

1 0

[tor/maint-0.2.9] Travis: use -std=gnu99 in some jobs
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor <teor(a)torproject.org> Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++++++--- changes/ticket32500 | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 000000000..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: + - Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500.

1 0

[tor/master] Travis: use -std=gnu99 in some jobs
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor <teor(a)torproject.org> Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++++++--- changes/ticket32500 | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 000000000..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: + - Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500.

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor <teor(a)torproject.org> Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +++++++++----- changes/ticket32500 | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/master] Travis: use -std=gnu99 with NSS, and clang with Chutney
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor <teor(a)torproject.org> Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS - ## NSS is a fast job, clang is slower on Linux, so we do NSS clang - - env: NSS_OPTIONS="--enable-nss" - compiler: clang - ## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" + - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" + ## We run chutney on Linux, because it's faster than chutney on macOS + ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240.

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 14089a29b54f1bc46ca0ff263abdc152f013051a Merge: 26071aa3b febbc236d Author: teor <teor(a)torproject.org> Date: Tue Dec 3 12:46:50 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 14 +++++++++----- changes/ticket32500 | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor <teor(a)torproject.org> Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++++++--- changes/ticket32500 | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" + ## We check NSS + ## NSS is a fast job, clang is slower on Linux, so we do NSS clang + - env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi

1 0

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit a4c22164c022aee8db962a08039bc6f1c3905585 Merge: f63cf2158 3207a8e5c Author: teor <teor(a)torproject.org> Date: Tue Dec 3 12:47:05 2019 +1000 Merge branch 'maint-0.4.2' .travis.yml | 14 +++++++++----- changes/ticket32500 | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-)

1 0