Skip to content

Commit

Permalink
Update zmq to 4.3.1
Browse files Browse the repository at this point in the history
Summary:
From [[bitcoin/bitcoin#15188 | PR15188]]:
```
Addresses https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6250
```

From [[bitcoin/bitcoin#16927 | PR16927]]:
```
Currently in Alpine Linux (latest, 3.10) in the depends system, one of
the ZeroMQ patches won't apply cleanly because the context around the
patch has changed and Alpine's patch implementation can't handle the
diff.

Some patch implementations can't handle fuzz / too much divergence from
the original code.

This PR just tweaks the context code around the patch so that
less-sophisticated patch implementations (such as on Alpine Linux) can
apply the patch without errors.
```

Backport of core [[bitcoin/bitcoin#15188 | PR15188]] and [[bitcoin/bitcoin#16927 | PR16927]].

Depends on D5603.

Test Plan: Run the Gitian builds.

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5607
  • Loading branch information
rex4539 authored and Fabcien committed Mar 31, 2020
1 parent 68e6fd9 commit 1a7a047
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions depends/packages/zeromq.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=zeromq
$(package)_version=4.2.5
$(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=cc9090ba35713d59bb2f7d7965f877036c49c5558ea0c290b0dcc6f2a17e489f
$(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
$(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_set_name_np.patch

define $(package)_set_vars
Expand Down
6 changes: 3 additions & 3 deletions depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/src/thread.cpp b/src/thread.cpp
index a1086b0c..9943f354 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -307,7 +307,7 @@ void zmq::thread_t::setThreadName (const char *name_)
@@ -308,7 +308,7 @@ void zmq::thread_t::setThreadName (const char *name_)
*/
if (!name_)
return;
Expand All @@ -21,9 +21,9 @@ index a1086b0c..9943f354 100644
#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
int rc = pthread_setname_np (name_);
if (rc)
@@ -323,6 +323,8 @@ void zmq::thread_t::setThreadName (const char *name_)
@@ -324,6 +324,8 @@ void zmq::thread_t::setThreadName (const char *name_)
#elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
pthread_set_name_np (descriptor, name_);
pthread_set_name_np (_descriptor, name_);
#endif
+#endif
+ return;
Expand Down
2 changes: 1 addition & 1 deletion doc/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ These are the dependencies currently used by Bitcoin ABC. You can find instructi
| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | 5.5.1 | No | | |
| XCB | | | | | Yes (Linux only) |
| xkbcommon | | | | | Yes (Linux only) |
| ZeroMQ | [4.2.5](https://github.com/zeromq/libzmq/releases) | 4.1.5 | No | | |
| ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) | 4.1.5 | No | | |
| zlib | [1.2.11](http://zlib.net/) | | | | No |

0 comments on commit 1a7a047

Please sign in to comment.