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

[Kyle Keen]

    Date: Tuesday, December 17, 2013 @ 02:12:46
  Author: kkeen
Revision: 102638

upgpkg: zeromq 4.0.3-1

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

------------------+
 LIBZMQ-569.patch |   30 ------------------------------
 PKGBUILD         |   17 +++++------------
 2 files changed, 5 insertions(+), 42 deletions(-)

Deleted: LIBZMQ-569.patch
===================================================================
--- LIBZMQ-569.patch	2013-12-16 23:22:00 UTC (rev 102637)
+++ LIBZMQ-569.patch	2013-12-17 01:12:46 UTC (rev 102638)
@@ -1,30 +0,0 @@
-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-12-16 23:22:00 UTC (rev 102637)
+++ PKGBUILD	2013-12-17 01:12:46 UTC (rev 102638)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Kyle Keen <keenerd at 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,17 +11,10 @@
 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')
+        https://raw.github.com/zeromq/cppzmq/master/zmq.hpp)
+md5sums=('8348341a0ea577ff311630da0d624d45'
+         '388ddb07fdd88b040769e8f4c9b397fa')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/LIBZMQ-569.patch"
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure prefix=/usr --with-pgm --with-libsodium