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

[tor/master] Travis: Use macOS 10.14 with Xcode 11.2
by teor＠torproject.org 29 Oct '19

29 Oct '19

commit 14b197a148dbafd197141799d9d611244418aa5e Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:41:17 2019 +1000 Travis: Use macOS 10.14 with Xcode 11.2 Closes ticket 32241. --- .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d429e1537..59f9ae74c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,10 +103,11 @@ addons: - asciidoc - xmlto -## (OSX only) Use the default OSX image +## (OSX only) Use a recent macOS 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 +## Default is Xcode 9.4 on macOS 10.13 as of October 2019 +## Recent is Xcode 11.2 on macOS 10.14 as of October 2019 +osx_image: xcode11.2 install: ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) diff --git a/changes/ticket32241 b/changes/ticket32241 new file mode 100644 index 000000000..4243cec17 --- /dev/null +++ b/changes/ticket32241 @@ -0,0 +1,2 @@ + o Testing (continuous integration): + - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
by teor＠torproject.org 29 Oct '19

29 Oct '19

commit 752c35ca9673c91a9edff84f2efaabe4d04c9c60 Merge: 93be7275e 14b197a14 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:23:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

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

29 Oct '19

commit 63aff4a43e0ed2b50632beb4e630f2504881538e Merge: 63581d55a 54e2d0dc2 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:48 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

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

29 Oct '19

commit 54e2d0dc2d790a9e84ec44db2d53d535d8076602 Merge: e56e7e865 15d67842f Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

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

29 Oct '19

commit 15d67842f9c1cb993491cf473478999dace7c6c2 Merge: e03db9934 752c35ca9 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:32 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --cc .travis.yml index 4ded5e25a,4ea9400b8..7f0e78587 --- a/.travis.yml +++ b/.travis.yml @@@ -145,19 -106,13 +145,20 @@@ addons ## Always installed, because manual brew installs are hard to get right - asciidoc - xmlto + ## Utilities + ## preventing or diagnosing hangs + - timelimit - ## (OSX only) Use the default OSX image + ## (OSX only) Use a recent macOS 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 + ## Default is Xcode 9.4 on macOS 10.13 as of October 2019 + ## Recent is Xcode 11.2 on macOS 10.14 as of October 2019 + osx_image: xcode11.2 +before_install: + ## 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, 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

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 29 Oct '19

29 Oct '19

commit 2395800d3e333ec4637ece4bee0a0a1af81c0cbc Merge: d7c40beea 63aff4a43 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:55 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

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

29 Oct '19

commit b448f6044d37959f2b9bea3c5c2bc5f98c4d9170 Merge: bf16efeb0 2395800d3 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:27:02 2019 +1000 Merge branch 'maint-0.4.2' .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[bridgedb/develop] Merge branch 'fix/32105' into develop
by phw＠torproject.org 29 Oct '19

29 Oct '19

commit 31092900bb569fbd0e41b6cdf74a613e70df20d3 Merge: b3cd9ac 5151a32 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Oct 28 15:13:12 2019 -0700 Merge branch 'fix/32105' into develop CHANGELOG | 3 +++ README.rst | 1 + 2 files changed, 4 insertions(+)

1 0

[bridgedb/develop] Update Beautiful Soup and pillow requirements.
by phw＠torproject.org 29 Oct '19

29 Oct '19

commit d4fad3ed7996ddd4cff350334ea5f662c35b8746 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Oct 28 15:16:30 2019 -0700 Update Beautiful Soup and pillow requirements. See CVE-2019-16865 for more details: <https://nvd.nist.gov/vuln/detail/CVE-2019-16865> --- .travis.requirements.txt | 4 ++-- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 3e768d2..6c11fcd 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -14,7 +14,7 @@ # #------------------------------------------------------------------------------ Babel==2.7.0 -BeautifulSoup==3.2.1 +BeautifulSoup==3.2.2 Mako==1.1.0 pycryptodome==3.9.0 Twisted==19.7.0 @@ -23,7 +23,7 @@ coveralls==1.8.2 gnupg==2.3.1 ipaddr==2.2.0 mechanize==0.4.3 -Pillow==6.1.0 +Pillow==6.2.1 pygeoip==0.3.2 qrcode==6.1 service_identity==18.1.0 diff --git a/requirements.txt b/requirements.txt index 6944d1a..a78e1e2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ Babel==2.7.0 -BeautifulSoup==3.2.1 +BeautifulSoup==3.2.2 Mako==1.1.0 pycryptodome==3.9.0 Twisted==19.7.0 gnupg==2.3.1 ipaddr==2.2.0 -Pillow==6.1.0 +Pillow==6.2.1 pyOpenSSL==19.0.0 pygeoip==0.3.2 qrcode==6.1

1 0

[bridgedb/develop] Add undocumented OS-level dependency.
by phw＠torproject.org 29 Oct '19

29 Oct '19

commit 5151a329394b14341aa93903e617995f5b274fae Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Oct 16 17:21:44 2019 -0700 Add undocumented OS-level dependency. BridgeDB uses the binary dkimverify in /home/bridgedb/.procmailrc. The binary used to be provided by the python-dkim package (which is installed on polyanthum) but with the upgrade to Debian Buster, it is now provided by python3-dkim (which is not installed). This patch makes this OS-level dependency explicit. This commit fixes <https://bugs.torproject.org/32105>. --- CHANGELOG | 3 +++ README.rst | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 5b6dce6..c91b026 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,9 @@ Changes in version A.B.C - YYYY-MM-DD translation request and also updates our instructions on how to request new translations. + * FIXES https://bugs.torproject.org/32105 + Mention an undocumented OS-level dependency: python3-dkim. + Changes in version 0.9.0 - 2019-10-16 * FIXES https://bugs.torproject.org/26543 diff --git a/README.rst b/README.rst index 2576fa7..6fce8a0 100644 --- a/README.rst +++ b/README.rst @@ -80,6 +80,7 @@ BridgeDB requires the following OS-level dependencies: - python>=2.7 - python-dev +- `python3-dkim <https://pypi.org/project/dkimpy/>`__ (it contains the ``dkimverify`` binary) - build-essential - gnupg (preferrably, gnupg2) - OpenSSL>=1.0.1g

1 0