aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-01-30 16:13:58 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2019-01-30 16:29:56 +0100
commit09a9238c045670ce22a2798a717925248d1483f4 (patch)
tree9e1c0a54439203f1fe9b452b6d48c7571c0f0b67
parent1220b91fa7e8c4d2564f2ab11d7ee880a9815a72 (diff)
parent84187072860707ddf06ebd629f30f12a0398c2cb (diff)
downloadbitcoin-09a9238c045670ce22a2798a717925248d1483f4.tar.xz
Merge #15252: [0.17] Backport: Update zmq to 4.3.1
84187072860707ddf06ebd629f30f12a0398c2cb Update zmq to 4.3.1 (Dimitris Apostolou) Pull request description: Backports #15188 to the 0.17 branch. Addresses https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6250. Tree-SHA512: f8047a22430dcc92ef713e72281286c4cad2fbe3cd6880cb16b9f8c83bdc481a72539ff5fd373133ac006409ca083db68368e56df47a50798963e77fb3e579f2
-rw-r--r--depends/packages/zeromq.mk4
-rw-r--r--doc/dependencies.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
index d5fd1f39ab..dfbc50580c 100644
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@@ -1,8 +1,8 @@
package=zeromq
-$(package)_version=4.2.3
+$(package)_version=4.3.1
$(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=8f1e2b2aade4dbfde98d82366d61baef2f62e812530160d2e6d0a5bb24e40bc0
+$(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
$(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_set_name_np.patch
define $(package)_set_vars
diff --git a/doc/dependencies.md b/doc/dependencies.md
index 3fc7aecba8..90e14e3fef 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -26,5 +26,5 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
| Qt | [5.9.6](https://download.qt.io/official_releases/qt/) | 5.x | No | | |
| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L87) (Linux only) |
| xkbcommon | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L86) (Linux only) |
-| ZeroMQ | [4.2.3](https://github.com/zeromq/libzmq/releases) | | No | | |
+| ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) | | No | | |
| zlib | [1.2.11](https://zlib.net/) | | | | No |