Hi, This diff updates zeromq to the latest release. Tested on amd64.
Comments ? OK ? -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/net/zeromq/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 4 Nov 2015 09:33:18 -0000 1.19 +++ Makefile 14 Jan 2016 08:44:38 -0000 @@ -4,10 +4,9 @@ SHARED_ONLY = Yes COMMENT = open source message queue optimised for performance -DISTNAME = zeromq-4.1.3 -REVISION = 0 +DISTNAME = zeromq-4.1.4 -SHARED_LIBS += zmq 4.1 # 4.0 +SHARED_LIBS += zmq 4.1 # 5.0 CATEGORIES = net HOMEPAGE = http://zeromq.org/ Index: distinfo =================================================================== RCS file: /cvs/ports/net/zeromq/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo 26 Oct 2015 18:10:56 -0000 1.11 +++ distinfo 14 Jan 2016 08:44:38 -0000 @@ -1,2 +1,2 @@ -SHA256 (zeromq-4.1.3.tar.gz) = YbMcgw2zd3d+QXI1ok02YKS8w/QNMD7ljfCC/NaL9BE= -SIZE (zeromq-4.1.3.tar.gz) = 1372069 +SHA256 (zeromq-4.1.4.tar.gz) = 6Z9E/eJcLky4TORA+Hyn0/4yccK4z7xn1V5N4l5v43g= +SIZE (zeromq-4.1.4.tar.gz) = 1400012 Index: patches/patch-src_curve_client_cpp =================================================================== RCS file: patches/patch-src_curve_client_cpp diff -N patches/patch-src_curve_client_cpp --- patches/patch-src_curve_client_cpp 4 Nov 2015 09:33:18 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,33 +0,0 @@ -$OpenBSD: patch-src_curve_client_cpp,v 1.2 2015/11/04 09:33:18 sthen Exp $ - -From 89d4e995ef92d5cb3d0f0373ec7d80c2ad7fa0d3 Mon Sep 17 00:00:00 2001 -From: Constantin Rack <constan...@rack.li> -Date: Sat, 8 Nov 2014 10:50:17 +0100 -Subject: [PATCH] Problem: return code of sodium_init() is not checked. - ---- src/curve_client.cpp.orig Mon Jun 15 10:43:08 2015 -+++ src/curve_client.cpp Wed Nov 4 09:27:59 2015 -@@ -48,6 +48,7 @@ zmq::curve_client_t::curve_client_t (const options_t & - 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); -@@ -57,12 +58,12 @@ zmq::curve_client_t::curve_client_t (const options_t & - 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); - } - Index: patches/patch-src_curve_server_cpp =================================================================== RCS file: patches/patch-src_curve_server_cpp diff -N patches/patch-src_curve_server_cpp --- patches/patch-src_curve_server_cpp 4 Nov 2015 09:33:18 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,33 +0,0 @@ -$OpenBSD: patch-src_curve_server_cpp,v 1.2 2015/11/04 09:33:18 sthen Exp $ - -From 89d4e995ef92d5cb3d0f0373ec7d80c2ad7fa0d3 Mon Sep 17 00:00:00 2001 -From: Constantin Rack <constan...@rack.li> -Date: Sat, 8 Nov 2014 10:50:17 +0100 -Subject: [PATCH] Problem: return code of sodium_init() is not checked. - ---- src/curve_server.cpp.orig Mon Jun 15 10:43:08 2015 -+++ src/curve_server.cpp Wed Nov 4 09:27:59 2015 -@@ -52,6 +52,7 @@ zmq::curve_server_t::curve_server_t (session_base_t *s - 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); -@@ -60,12 +61,12 @@ zmq::curve_server_t::curve_server_t (session_base_t *s - 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); - } -
