gentoo resync : 28.04.2019

2 files changed, 0 insertions, 106 deletions

diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index f857e0171092..d86fd7e840c9 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,4 +1,3 @@
-AUX zeromq-3.2.3-unused-variable.patch 4012 BLAKE2B 8ce02ae0eb5696977e65ee28687418ff929268ab93ea0e7207b3aa8c0ce38205d2ac3cb33cd4758811f99ab64b0efbfb276a0d3b4546f48475e763bc7b6d32be SHA512 c54ee2ff1d11c33c734b7696a3fa98be8e0a5025678ac31599c652a4f0e2b507f41de3aae8d6808086bbe72fd0d485945ed2b822f984c2053f1f6f69b62a7b1f
 AUX zeromq-4.3.1-fix-test_security_zap.patch 1008 BLAKE2B 17f5a316601af1c8e7c307a964f69bf0d59c55ee0a9076eee4a909768307cef8be0d901d6ecae10381505b96bda95f20ffa0d1bde09e8c1bf6f0fc2959e9f065 SHA512 e813dc7488c5a81731f5649b2ecc533e55c4a3f69b904a1fbf2446ad6282ece96a64850b70f675c6cb0e20636c4654786ffdc99742ae1325c16469735e7ea616
 DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
 DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
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 9fb86fa7d5c2..000000000000
--- 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)