[arch-commits] Commit in zeromq/trunk (LIBZMQ-569.patch PKGBUILD)

[Massimiliano Torromeo]

    Date: Thursday, October 24, 2013 @ 18:10:33
  Author: mtorromeo
Revision: 99116

upgpkg: zeromq 4.0.1-5

Patch for bug https://zeromq.jira.com/browse/LIBZMQ-569

Added:
  zeromq/trunk/LIBZMQ-569.patch
Modified:
  zeromq/trunk/PKGBUILD

------------------+
 LIBZMQ-569.patch |   30 ++++++++++++++++++++++++++++++
 PKGBUILD         |   15 +++++++++++----
 2 files changed, 41 insertions(+), 4 deletions(-)

Added: LIBZMQ-569.patch
===================================================================
--- LIBZMQ-569.patch	                        (rev 0)
+++ LIBZMQ-569.patch	2013-10-24 16:10:33 UTC (rev 99116)
@@ -0,0 +1,30 @@
+From 7ecab54ac3b7a6103c46892990217acafb039eed Mon Sep 17 00:00:00 2001
+From: Martin Hurton <hurtonm at gmail.com>
+Date: Fri, 21 Jun 2013 16:23:38 +0200
+Subject: [PATCH] Load identity message to decoder at start
+
+---
+ src/stream_engine.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp
+index 0d87581..2c07889 100644
+--- a/src/stream_engine.cpp
++++ b/src/stream_engine.cpp
+@@ -480,6 +480,13 @@ bool zmq::stream_engine_t::handshake ()
+         //  header data away.
+         const size_t header_size = options.identity_size + 1 >= 255 ? 10 : 2;
+         unsigned char tmp [10], *bufferp = tmp;
++
++        //  Prepare the identity message and load it into encoder.
++        //  Then consume bytes we have already sent to the peer.
++        const int rc = tx_msg.init_size (options.identity_size);
++        zmq_assert (rc == 0);
++        memcpy (tx_msg.data (), options.identity, options.identity_size);
++        encoder->load_msg (&tx_msg);
+         size_t buffer_size = encoder->encode (&bufferp, header_size);
+         zmq_assert (buffer_size == header_size);
+ 
+-- 
+1.8.4
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-24 15:22:27 UTC (rev 99115)
+++ PKGBUILD	2013-10-24 16:10:33 UTC (rev 99116)
@@ -2,7 +2,7 @@
 # Maintainer: Kyle Keen <keenerd at gmail.com>
 pkgname=zeromq
 pkgver=4.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Fast messaging system built on sockets, C and C++ bindings.  aka 0MQ, ZMQ."
 arch=('i686' 'x86_64')
 url="http://www.zeromq.org"
@@ -9,12 +9,19 @@
 license=('LGPL')
 depends=('gcc-libs' 'util-linux' 'libsodium')
 makedepends=('python2')
-options=('staticlibs') 
+options=('staticlibs')
 source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz
-        https://raw.github.com/zeromq/cppzmq/master/zmq.hpp)
+        https://raw.github.com/zeromq/cppzmq/master/zmq.hpp
+        LIBZMQ-569.patch)
 md5sums=('e738c310d135e20fa48c5b348da18e22'
-         '388ddb07fdd88b040769e8f4c9b397fa')
+         '388ddb07fdd88b040769e8f4c9b397fa'
+         '2ef4f92027ec2b88e8eec86b2cccf2e4')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir/LIBZMQ-569.patch"
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure prefix=/usr --with-pgm --with-libsodium