October 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit 8f872e9459411e558719ef91edf8c2fe02344c43 Merge: 8464f4433 f7e93cf2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 51 ++++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 34 insertions(+), 21 deletions(-)

1 0

[tor/release-0.3.4] Travis: use the Homebrew addon for xz and zstd
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit 49ffc035729f02fa6e6dc49bc24807d8e8503f2b Author: teor <teor(a)torproject.org> Date: Tue Sep 18 19:36:28 2018 +1000 Travis: use the Homebrew addon for xz and zstd xz and zstd were added as optional dependencies in 0.3.1.1-alpha. Implements ticket 27738. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 878175f66..68842419a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,6 +140,8 @@ addons: #- zlib ## Optional dependencies - libscrypt + - xz + - zstd ## Required build dependencies ## Tor needs pkg-config to find some dependencies at build time - pkg-config @@ -162,8 +164,6 @@ before_install: install: ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zstd; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features

1 0

[tor/release-0.3.4] Merge branch 'bug27738-033' into bug27738-034
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit 484b259604175a7cac313346b8574a36c70b66b7 Merge: 48182c147 cc10873de Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Oct 10 15:13:02 2018 -0500 Merge branch 'bug27738-033' into bug27738-034 .travis.yml | 51 ++++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 34 insertions(+), 21 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'bug27738-029' into bug27738-032
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit e81001a0884b389a3218247f68b19facdf474f2c Merge: 0971b3ce4 e8c7d7d3b Author: teor <teor(a)torproject.org> Date: Tue Sep 18 19:34:53 2018 +1000 Merge branch 'bug27738-029' into bug27738-032 Resolve conflicts due to modified comments, and deleted lines. .travis.yml | 47 ++++++++++++++++++++++++++++------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 19 deletions(-) diff --cc .travis.yml index 82eeecb58,939f4f4e9..878175f66 --- a/.travis.yml +++ b/.travis.yml @@@ -114,12 -97,9 +117,12 @@@ addons - zlib1g-dev ## Optional dependencies - libcap-dev + - liblzma-dev - libscrypt-dev - libseccomp-dev + ## zstd doesn't exist in Ubuntu Trusty + #- libzstd - ## Conditional dependencies + ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc - docbook-xsl @@@ -131,44 -132,16 +155,29 @@@ ## Default is Xcode 9.4 on macOS 10.13 as of August 2018 #osx_image: xcode9.4 +before_install: - ## If we're on OSX, homebrew usually needs to be updated first - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - ## We might be upgrading some useless packages, but that's better than missing an upgrade - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi + ## Create empty rust directories for non-Rust builds, so caching succeeds + - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi + install: - ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi - ## macOS comes with zlib by default, so the homebrew install is keg-only - # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi - ## If we're on OSX also install the optional dependencies - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zstd; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi - ## If we're on OSX, and using asciidoc, install asciidoc - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi + ## If we're using Rust, download rustup + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi + ## If we're testing rust builds in offline-mode, then set up our vendored dependencies + - if [[ "$RUST_DEPENDENCIES" == "true" ]]; then export RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi

1 0

[tor/release-0.3.4] Travis: use the Homebrew addon
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit e8c7d7d3be2a281954294fe5738dfd2aa72357e7 Author: teor <teor(a)torproject.org> Date: Tue Sep 18 19:26:54 2018 +1000 Travis: use the Homebrew addon Use the Travis Homebrew addon to install packages on macOS. The package list is the same, but the Homebrew addon does not do a `brew update` by default. This makes builds faster, at the cost of using slightly older packages. Implements ticket 27738. --- .travis.yml | 49 ++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06db583e1..939f4f4e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,55 +85,62 @@ sudo: ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty -## (Linux only) Download our dependencies +## Download our dependencies addons: + ## (Linux only) apt: packages: ## Required dependencies - libevent-dev + ## Ubuntu comes with OpenSSL by default + #- libssl-dev - zlib1g-dev ## Optional dependencies - libcap-dev - libscrypt-dev - libseccomp-dev - ## Conditional dependencies + ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc - docbook-xsl - docbook-xml - xmlto + ## (OSX only) + homebrew: + packages: + ## Required dependencies + - libevent + ## The OSX version of OpenSSL is way too old + - openssl + ## OSX comes with zlib by default + ## to use a newer zlib, pass the keg path to configure (like OpenSSL) + #- zlib + ## Optional dependencies + - libscrypt + ## Required build dependencies + ## Tor needs pkg-config to find some dependencies at build time + - pkg-config + ## Optional build dependencies + - ccache + ## Conditional build dependencies + ## Always installed, because manual brew installs are hard to get right + - asciidoc + - xmlto ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version ## Default is Xcode 9.4 on macOS 10.13 as of August 2018 #osx_image: xcode9.4 -before_install: - ## If we're on OSX, homebrew usually needs to be updated first - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - ## We might be upgrading some useless packages, but that's better than missing an upgrade - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi - install: - ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi - ## macOS comes with zlib by default, so the homebrew install is keg-only - # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi - ## If we're on OSX also install the optional dependencies - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi - ## If we're on OSX, and using asciidoc, install asciidoc - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi ## ## Finally, list installed package versions diff --git a/changes/ticket27738 b/changes/ticket27738 new file mode 100644 index 000000000..f23bfb019 --- /dev/null +++ b/changes/ticket27738 @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - Use the Travis Homebrew addon to install packages on macOS. The package + list is the same, but the Homebrew addon does not do a `brew update` by + default. Implements ticket 27738.

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit 717507e3bb38d11814f4128ed7ccde676ab2aa89 Merge: 119df9c1c e8c7d7d3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 17:12:11 2018 -0400 Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9 .travis.yml | 49 ++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 21 deletions(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit cc10873dee71f8250f19e580826f756fa291e197 Merge: b057623be 49ffc0357 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Oct 10 15:01:59 2018 -0500 Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033 .travis.yml | 51 ++++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 34 insertions(+), 21 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit f7e93cf2e7c80fa6dc6c907893b7b01c31b588d1 Merge: cc10873de 717507e3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.3

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit ffaf180b7e11897efaf874ec2ddcc72a8a2e67e5 Merge: 484b25960 f7e93cf2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit 09219047631c4375c20a6b60d14dfed108bec895 Merge: 70624a3be ffaf180b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .travis.yml | 51 ++++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 34 insertions(+), 21 deletions(-)

1 0