diff options
Diffstat (limited to 'community/zeromq')
| -rw-r--r-- | community/zeromq/LIBZMQ-569.patch | 30 | ||||
| -rw-r--r-- | community/zeromq/PKGBUILD | 19 |
2 files changed, 6 insertions, 43 deletions
diff --git a/community/zeromq/LIBZMQ-569.patch b/community/zeromq/LIBZMQ-569.patch deleted file mode 100644 index a1e27f622..000000000 --- a/community/zeromq/LIBZMQ-569.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7ecab54ac3b7a6103c46892990217acafb039eed Mon Sep 17 00:00:00 2001 -From: Martin Hurton <hurtonm@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 - diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index 1e1da4244..6c3f2b7ba 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99117 2013-10-24 16:13:47Z mtorromeo $ +# $Id: PKGBUILD 102639 2013-12-17 01:13:09Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=zeromq -pkgver=4.0.1 -pkgrel=5 +pkgver=4.0.3 +pkgrel=1 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64') url="http://www.zeromq.org" @@ -11,16 +11,9 @@ depends=('gcc-libs' 'util-linux' 'libsodium') makedepends=('python2') options=('staticlibs') source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz - https://raw.github.com/zeromq/cppzmq/master/zmq.hpp - LIBZMQ-569.patch) -md5sums=('e738c310d135e20fa48c5b348da18e22' - '388ddb07fdd88b040769e8f4c9b397fa' - '2ef4f92027ec2b88e8eec86b2cccf2e4') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/LIBZMQ-569.patch" -} + https://raw.github.com/zeromq/cppzmq/master/zmq.hpp) +md5sums=('8348341a0ea577ff311630da0d624d45' + '388ddb07fdd88b040769e8f4c9b397fa') build() { cd "$srcdir/$pkgname-$pkgver" |