reinit the tree, so we can have metadata

4 files changed, 235 insertions, 0 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
new file mode 100644
index 000000000000..9fb86fa7d5c2
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
@@ -0,0 +1,105 @@
+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)
diff --git a/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch b/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch
new file mode 100644
index 000000000000..c00001d632a5
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch
@@ -0,0 +1,25 @@
+From 1b3fcbd3eead8f1f59f3e9472319d58ce6b52bb7 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <luca.boccassi@gmail.com>
+Date: Thu, 10 Nov 2016 22:49:41 +0000
+Subject: [PATCH] Problem: linker fails looking for dladdr
+
+Solution: search and add it via AC_CHECK_LIB when building with
+libunwind, as the backtrace function uses dladdr. This problem
+only appears on some distributions and with some compiler/toolchain
+versions.
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4fb2757..d548f9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -650,6 +650,7 @@ PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
+         AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
+         AC_SUBST([LIBUNWIND_CFLAGS])
+         AC_SUBST([LIBUNWIND_LIBS])
++        AC_CHECK_LIB([dl], [dladdr])
+     ],
+     [
+         AC_MSG_WARN([Cannot find libunwind])
diff --git a/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch b/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch
new file mode 100644
index 000000000000..3efe2153bfa9
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch
@@ -0,0 +1,35 @@
+From 90c76fbd6069b8e1e98236f31317ed22792ab739 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <luca.boccassi@gmail.com>
+Date: Fri, 28 Apr 2017 16:08:46 +0100
+Subject: [PATCH] Problem: new zmq_poller used by zmq_poll without DRAFTs
+
+Solution: do not define ZMQ_HAVE_POLLER in src/zmq_drafts.h otherwise
+src/zmq.cpp will implement zmq_poll using the new poller classes.
+Same for ZMQ_HAVE_TIMERS, even though it has no internal effect, but
+to be safe against future development.
+---
+ src/zmq_draft.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/zmq_draft.h b/src/zmq_draft.h
+index bfbf9e3..9aed6dd 100644
+--- a/src/zmq_draft.h
++++ b/src/zmq_draft.h
+@@ -67,8 +67,6 @@ const char *zmq_msg_group(zmq_msg_t *msg);
+ /*  Poller polling on sockets,fd and thread-safe sockets                      */
+ /******************************************************************************/
+ 
+-#define ZMQ_HAVE_POLLER
+-
+ typedef struct zmq_poller_event_t
+ {
+     void *socket;
+@@ -103,8 +101,6 @@ int zmq_poller_remove_fd (void *poller, int fd);
+ /*  Scheduling timers                                                         */
+ /******************************************************************************/
+ 
+-#define ZMQ_HAVE_TIMERS
+-
+ typedef void (zmq_timer_fn)(int timer_id, void *arg);
+ 
+ void *zmq_timers_new (void);
diff --git a/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch b/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch
new file mode 100644
index 000000000000..36a5f66bbc91
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch
@@ -0,0 +1,70 @@
+Accepted upstream as: https://github.com/zeromq/libzmq/pull/2625
+
+From 88487e7da3e0412abde30af2855a667ab973f9fc Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 14 Jul 2017 21:44:30 +0100
+Subject: [PATCH] configure.ac: allow user to disable libunwind discovery via
+ --disable-libunwind
+
+on ia64 architecture libunwind comes with gcc. Unfortunately
+libunwind is not directly usable as-is and fails at link time:
+
+```
+    ia64-unknown-linux-gnu-g++ -o perf/.libs/local_lat perf/local_lat.o src/.libs/libzmq.so -lsodium -lrt -lpthread -ldl
+    src/.libs/libzmq.so: undefined reference to `_ULia64_step'
+```
+
+The change adds --{enable,disable}-libunwind flag to control
+automatic dependency. The default is unchanged: use if available.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac | 32 ++++++++++++++++++++++----------
+ 1 file changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c10f8445..ad193871 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -721,16 +721,28 @@ else
+     AC_SUBST(pkg_config_defines, "")
+ fi
+ 
+-PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
+-    [
+-        AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
+-        AC_SUBST([LIBUNWIND_CFLAGS])
+-        AC_SUBST([LIBUNWIND_LIBS])
+-        AC_CHECK_LIB([dl], [dladdr])
+-    ],
+-    [
+-        AC_MSG_WARN([Cannot find libunwind])
+-    ])
++AC_ARG_ENABLE([libunwind],
++    [AS_HELP_STRING([--enable-libunwind],
++        [enable libunwind [default=auto]])],
++    [enable_libunwind=$enableval],
++    [enable_libunwind="auto"])
++
++if test "x$enable_libunwind" != "xno"; then
++    PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
++        [
++            AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
++            AC_SUBST([LIBUNWIND_CFLAGS])
++            AC_SUBST([LIBUNWIND_LIBS])
++            AC_CHECK_LIB([dl], [dladdr])
++        ],
++        [
++            if test "x$enable_libunwind" = "xyes"; then
++                AC_MSG_ERROR([Cannot find libunwind])
++            else
++                AC_MSG_WARN([Cannot find libunwind])
++            fi
++        ])
++fi
+ 
+ # Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
+ AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
+-- 
+2.13.3
+