aboutsummaryrefslogtreecommitdiff
path: root/package/zeromq
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2016-02-10 11:47:46 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2016-02-11 23:12:32 +0100
commitf01a3f509b5ab5a01a345b6f2a87ea63262fb7f8 (patch)
tree3f16d7346a16968a107a7390acf5e88e5c11017d /package/zeromq
parent455d97555ab96c01e2fc8dd661ad2cdc876ffbf8 (diff)
downloadbuildroot-f01a3f509b5ab5a01a345b6f2a87ea63262fb7f8.tar.gz
buildroot-f01a3f509b5ab5a01a345b6f2a87ea63262fb7f8.tar.bz2
zermoq: bump to version 4.1.4
Drop 0003-Problem-return-code-of-sodium_init-is-not-checked.patch since it's in this release. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/zeromq')
-rw-r--r--package/zeromq/0003-Problem-return-code-of-sodium_init-is-not-checked.patch73
-rw-r--r--package/zeromq/zeromq.hash4
-rw-r--r--package/zeromq/zeromq.mk2
3 files changed, 3 insertions, 76 deletions
diff --git a/package/zeromq/0003-Problem-return-code-of-sodium_init-is-not-checked.patch b/package/zeromq/0003-Problem-return-code-of-sodium_init-is-not-checked.patch
deleted file mode 100644
index fcdbc9cde1..0000000000
--- a/package/zeromq/0003-Problem-return-code-of-sodium_init-is-not-checked.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 479db2113643e459c11db392e0fefd6400657c9e Mon Sep 17 00:00:00 2001
-From: Constantin Rack <constantin@rack.li>
-Date: Sat, 8 Nov 2014 10:50:17 +0100
-Subject: [PATCH] Problem: return code of sodium_init() is not checked.
-
-There are two todo comments in curve_client.cpp and curve_server.cpp that suggest
-checking the return code of sodium_init() call. sodium_init() returns -1 on error,
-0 on success and 1 if it has been called before and is already initalized:
-https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: Upstream
-
-diff --git a/src/curve_client.cpp b/src/curve_client.cpp
-index 6019c54..77fc420 100644
---- a/src/curve_client.cpp
-+++ b/src/curve_client.cpp
-@@ -38,6 +38,7 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) :
- cn_peer_nonce(1),
- sync()
- {
-+ int rc;
- memcpy (public_key, options_.curve_public_key, crypto_box_PUBLICKEYBYTES);
- memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES);
- memcpy (server_key, options_.curve_server_key, crypto_box_PUBLICKEYBYTES);
-@@ -47,12 +48,12 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) :
- unsigned char tmpbytes[4];
- randombytes(tmpbytes, 4);
- #else
-- // todo check return code
-- sodium_init();
-+ rc = sodium_init ();
-+ zmq_assert (rc != -1);
- #endif
-
- // Generate short-term key pair
-- const int rc = crypto_box_keypair (cn_public, cn_secret);
-+ rc = crypto_box_keypair (cn_public, cn_secret);
- zmq_assert (rc == 0);
- }
-
-diff --git a/src/curve_server.cpp b/src/curve_server.cpp
-index a3c4243..22c32d6 100644
---- a/src/curve_server.cpp
-+++ b/src/curve_server.cpp
-@@ -42,6 +42,7 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_,
- cn_peer_nonce(1),
- sync()
- {
-+ int rc;
- // Fetch our secret key from socket options
- memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES);
- scoped_lock_t lock (sync);
-@@ -50,12 +51,12 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_,
- unsigned char tmpbytes[4];
- randombytes(tmpbytes, 4);
- #else
-- // todo check return code
-- sodium_init();
-+ rc = sodium_init ();
-+ zmq_assert (rc != -1);
- #endif
-
- // Generate short-term key pair
-- const int rc = crypto_box_keypair (cn_public, cn_secret);
-+ rc = crypto_box_keypair (cn_public, cn_secret);
- zmq_assert (rc == 0);
- }
-
---
-2.4.10
-
diff --git a/package/zeromq/zeromq.hash b/package/zeromq/zeromq.hash
index b744740781..a3eeb451ca 100644
--- a/package/zeromq/zeromq.hash
+++ b/package/zeromq/zeromq.hash
@@ -1,4 +1,4 @@
# From http://download.zeromq.org/SHA1SUMS:
-sha1 b7185724f2fd56d0face50047757ac2a04d26ca4 zeromq-4.1.3.tar.gz
+sha1 b632a4b6f8a14390dc17824e37ff7b10831ce2b4 zeromq-4.1.4.tar.gz
# Calculated based on the hash above
-sha256 61b31c830db377777e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411 zeromq-4.1.3.tar.gz
+sha256 e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378 zeromq-4.1.4.tar.gz
diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index ab30b78c8c..ce01e50f62 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ZEROMQ_VERSION = 4.1.3
+ZEROMQ_VERSION = 4.1.4
ZEROMQ_SITE = http://download.zeromq.org
ZEROMQ_INSTALL_STAGING = YES
ZEROMQ_DEPENDENCIES = util-linux