summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2011-05-04 08:29:13 +0000
committerDirkjan Ochtman <djc@gentoo.org>2011-05-04 08:29:13 +0000
commitf0b8423fd06dd85344011ad3f0c1d1e38a55e429 (patch)
treeab2e505e54be96211c63d4e8c892f7d4708f4e85 /net-libs/zeromq/files
parentInitial import. (diff)
downloadgentoo-2-f0b8423fd06dd85344011ad3f0c1d1e38a55e429.tar.gz
gentoo-2-f0b8423fd06dd85344011ad3f0c1d1e38a55e429.tar.bz2
gentoo-2-f0b8423fd06dd85344011ad3f0c1d1e38a55e429.zip
Take upstream fix for bad assertion.
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/zeromq/files')
-rw-r--r--net-libs/zeromq/files/2.1.6-msg-mask.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/net-libs/zeromq/files/2.1.6-msg-mask.patch b/net-libs/zeromq/files/2.1.6-msg-mask.patch
new file mode 100644
index 000000000000..a8d3da568748
--- /dev/null
+++ b/net-libs/zeromq/files/2.1.6-msg-mask.patch
@@ -0,0 +1,12 @@
+https://github.com/zeromq/zeromq2-1/commit/71cb36d04bd74ca82aca3868e665831733995be7
+--- src/decoder.cpp.bak 2011-05-04 10:19:21.000000000 +0200
++++ src/decoder.cpp 2011-05-04 10:18:50.000000000 +0200
+@@ -109,7 +109,7 @@
+ bool zmq::decoder_t::flags_ready ()
+ {
+ // Store the flags from the wire into the message structure.
+- in_progress.flags = tmpbuf [0];
++ in_progress.flags = tmpbuf [0] | ~ZMQ_MSG_MASK;
+
+ next_step (zmq_msg_data (&in_progress), zmq_msg_size (&in_progress),
+ &decoder_t::message_ready);