[gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/files/

[Thomas Deutschmann]

commit:     d9f50dee9886342f261f51bdb16718e06596bc4b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 07:51:05 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 22:02:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f50dee

net-libs/zeromq: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11777
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../files/zeromq-3.2.3-unused-variable.patch       | 105 ---------------------
 1 file changed, 105 deletions(-)

diff --git a/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
deleted file mode 100644
index 9fb86fa7d5c..00000000000
--- a/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Fix building with -Wall.
-
-Description from upstream repo:
-    Author: Pieter Hintjens <ph@imatix.com>
-    Date:   Wed Jan 30 23:53:23 2013 +0100
-
-        Various cleanups to test programs
-        
-         - Patch applied using git am from libzmq commit 5f009e52
-         - tests/test_raw_sock.cpp doesn't exist in zeromq3-x, so that
-           file was manually removed from the patch before 'git am'
-        
-        Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
-X-GENTOO-BUG:     483318
-X-GENTOO-BUG-URL: https://bugs.gentoo.org/show_bug.cgi?id=483318
-X-UPSTREAM-URL:   https://github.com/zeromq/zeromq3-x/commit/bdd72826c96fa7cb6a8d2e5cf688c973a8e8d42f
-
---- a/tests/test_connect_delay.cpp
-+++ b/tests/test_connect_delay.cpp
-@@ -61,12 +61,12 @@ int main (void)
-     assert(from);
- 
-     val = 0;
--    zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof(val));
-+    zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val));
-     // This pipe will not connect
-     rc = zmq_connect (from, "tcp://localhost:5556");
-     assert (rc == 0);
-     // This pipe will 
--    rc = zmq_connect (from, "tcp://localhost:5555");
-+    rc = zmq_connect (from, "tcp://localhost:6555");
-     assert (rc == 0);
- 
-     // We send 10 messages, 5 should just get stuck in the queue
-@@ -112,7 +112,6 @@ int main (void)
-     // cause the pipe attachment to be delayed until the connection
-     // succeeds. 
-     context = zmq_ctx_new();
--    fprintf (stderr, " Rerunning with DELAY_ATTACH_ON_CONNECT\n");
- 
-     // Bind the valid socket
-     to = zmq_socket (context, ZMQ_PULL);
-@@ -182,7 +181,6 @@ int main (void)
-     // block. Then we reconnect and verify messages flow again.
-     context = zmq_ctx_new();
-     void *context2 = zmq_ctx_new();
--    fprintf (stderr, " Running DELAY_ATTACH_ON_CONNECT with disconnect\n");
- 
-     to = zmq_socket (context2, ZMQ_PULL);
-     assert (to);
-diff --git a/tests/test_disconnect_inproc.cpp b/tests/test_disconnect_inproc.cpp
-index 7875083..d6b68c6 100644
---- a/tests/test_disconnect_inproc.cpp
-+++ b/tests/test_disconnect_inproc.cpp
-@@ -40,16 +40,14 @@ int main(int argc, char** argv) {
-                 zmq_msg_t msg;
-                 zmq_msg_init (&msg);
-                 zmq_msg_recv (&msg, pubSocket, 0);
--                int msgSize = zmq_msg_size(&msg);
-                 char* buffer = (char*)zmq_msg_data(&msg);
- 
-                 if (buffer[0] == 0) {
-                     assert(isSubscribed);
--                    printf("unsubscribing from '%s'\n", strndup(buffer + 1, msgSize - 1));
-                     isSubscribed = false;
--                } else {
-+                } 
-+                else {
-                     assert(!isSubscribed);
--                    printf("subscribing on '%s'\n", strndup(buffer + 1, msgSize - 1));
-                     isSubscribed = true;
-                 }
- 
-@@ -66,11 +64,6 @@ int main(int argc, char** argv) {
-                 zmq_msg_t msg;
-                 zmq_msg_init (&msg);
-                 zmq_msg_recv (&msg, subSocket, 0);
--                int msgSize = zmq_msg_size(&msg);
--                char* buffer = (char*)zmq_msg_data(&msg);
--        
--                printf("received on subscriber '%s'\n", strndup(buffer, msgSize));
--        
-                 zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size);
-                 zmq_msg_close (&msg);
-         
-diff --git a/tests/test_last_endpoint.cpp b/tests/test_last_endpoint.cpp
-index 5f121c4..ef3230b 100644
---- a/tests/test_last_endpoint.cpp
-+++ b/tests/test_last_endpoint.cpp
-@@ -29,11 +29,10 @@ static void do_bind_and_verify (void *s, const char *endpoint)
- {
-     int rc = zmq_bind (s, endpoint);
-     assert (rc == 0);
--
--    char test [255];
--    size_t siz = 255;
--    rc = zmq_getsockopt (s, ZMQ_LAST_ENDPOINT, test, &siz);
--    assert (rc == 0 && strcmp (test, endpoint) == 0);
-+    char reported [255];
-+    size_t size = 255;
-+    rc = zmq_getsockopt (s, ZMQ_LAST_ENDPOINT, reported, &size);
-+    assert (rc == 0 && strcmp (reported, endpoint) == 0);
- }
- 
- int main (void)

[gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/files/

[Aaron Bauman]

commit:     dc1960aaf6a039fa143e6cc2ac5a0b3e5c3c1db1
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Nov 17 08:45:56 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 22:16:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1960aa

net-libs/zeromq: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13683
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/zeromq-4.3.1-fix-test_security_zap.patch | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch b/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
deleted file mode 100644
index 3c89024b84b..00000000000
--- a/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4147957a5eec57ec7a2a416dca74c3c0299a3432 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Sun, 13 Jan 2019 13:08:10 +0000
-Subject: [PATCH] Problem: test_security_zap fails on architectures that
- disallow unaligned pointer access
-
-Solution: use memcpy instead of doing pointer arithmetics with casting
-and dereferencing to fix the error on sparc64
----
- tests/testutil_security.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/testutil_security.hpp b/tests/testutil_security.hpp
-index 90999118c..437bfb298 100644
---- a/tests/testutil_security.hpp
-+++ b/tests/testutil_security.hpp
-@@ -345,7 +345,7 @@ static int get_monitor_event_internal (void *monitor_,
-     uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-     uint16_t event = *(uint16_t *) (data);
-     if (value_)
--        *value_ = *(uint32_t *) (data + 2);
-+        memcpy (value_, data + 2, sizeof (uint32_t));
- 
-     //  Second frame in message contains event address
-     zmq_msg_init (&msg);