Gentoo Archives: gentoo-commits

From: "Dirkjan Ochtman (djc)" <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/zeromq/files: 2.1.6-msg-mask.patch
Date: Wed, 04 May 2011 08:29:25
Message-Id: 20110504082913.91CD120057@flycatcher.gentoo.org
1 djc 11/05/04 08:29:13
2
3 Added: 2.1.6-msg-mask.patch
4 Log:
5 Take upstream fix for bad assertion.
6
7 (Portage version: 2.1.9.46/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-libs/zeromq/files/2.1.6-msg-mask.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/files/2.1.6-msg-mask.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/files/2.1.6-msg-mask.patch?rev=1.1&content-type=text/plain
14
15 Index: 2.1.6-msg-mask.patch
16 ===================================================================
17 https://github.com/zeromq/zeromq2-1/commit/71cb36d04bd74ca82aca3868e665831733995be7
18 --- src/decoder.cpp.bak 2011-05-04 10:19:21.000000000 +0200
19 +++ src/decoder.cpp 2011-05-04 10:18:50.000000000 +0200
20 @@ -109,7 +109,7 @@
21 bool zmq::decoder_t::flags_ready ()
22 {
23 // Store the flags from the wire into the message structure.
24 - in_progress.flags = tmpbuf [0];
25 + in_progress.flags = tmpbuf [0] | ~ZMQ_MSG_MASK;
26
27 next_step (zmq_msg_data (&in_progress), zmq_msg_size (&in_progress),
28 &decoder_t::message_ready);