Move all to deprecated folder.

This commit is contained in:
2016-11-16 21:57:57 +01:00
parent 01738a7684
commit 05de7d6c04
9777 changed files with 0 additions and 0 deletions

View File

@@ -0,0 +1,199 @@
commit 9daf6dd7c4947ce74ca729de5c3cfe8cbc304702
Author: Lionel Orry <lionel.orry@gmail.com>
Date: Fri Feb 6 15:11:07 2015 +0100
acinclude.m4: make kernel-specific flags cacheable
Specifically when cross-compiling, one can be willing to force these
variable values using the environment of a config.cache file. This
commit makes this possible.
The affected variables are:
* libzmq_cv_sock_cloexec
* libzmq_cv_so_keepalive
* libzmq_cv_tcp_keepcnt
* libzmq_cv_tcp_keepidle
* libzmq_cv_tcp_keepintvl
* libzmq_cv_tcp_keepalive
Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
diff --git a/acinclude.m4 b/acinclude.m4
index 4bbd19e..456740d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -586,8 +586,8 @@ dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found])
dnl # Check if SOCK_CLOEXEC is supported #
dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{
- AC_MSG_CHECKING(whether SOCK_CLOEXEC is supported)
- AC_TRY_RUN([/* SOCK_CLOEXEC test */
+ AC_CACHE_CHECK([whether SOCK_CLOEXEC is supported], [libzmq_cv_sock_cloexec],
+ [AC_TRY_RUN([/* SOCK_CLOEXEC test */
#include <sys/types.h>
#include <sys/socket.h>
@@ -596,11 +596,13 @@ int main (int argc, char *argv [])
int s = socket (PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
return (s == -1);
}
- ],
- [AC_MSG_RESULT(yes) ; libzmq_cv_sock_cloexec="yes" ; $1],
- [AC_MSG_RESULT(no) ; libzmq_cv_sock_cloexec="no" ; $2],
- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_sock_cloexec="no"]
+ ],
+ [libzmq_cv_sock_cloexec="yes"],
+ [libzmq_cv_sock_cloexec="no"],
+ [libzmq_cv_sock_cloexec="not during cross-compile"]
+ )]
)
+ AS_IF([test "x$libzmq_cv_sock_cloexec" = "xyes"], [$1], [$2])
}])
dnl ################################################################################
@@ -628,8 +630,8 @@ dnl # LIBZMQ_CHECK_SO_KEEPALIVE([action-if-found], [action-if-not-found])
dnl # Check if SO_KEEPALIVE is supported #
dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_SO_KEEPALIVE], [{
- AC_MSG_CHECKING(whether SO_KEEPALIVE is supported)
- AC_TRY_RUN([/* SO_KEEPALIVE test */
+ AC_CACHE_CHECK([whether SO_KEEPALIVE is supported], [libzmq_cv_so_keepalive],
+ [AC_TRY_RUN([/* SO_KEEPALIVE test */
#include <sys/types.h>
#include <sys/socket.h>
@@ -641,11 +643,13 @@ int main (int argc, char *argv [])
((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1)
);
}
- ],
- [AC_MSG_RESULT(yes) ; libzmq_cv_so_keepalive="yes" ; $1],
- [AC_MSG_RESULT(no) ; libzmq_cv_so_keepalive="no" ; $2],
- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_so_keepalive="no"]
+ ],
+ [libzmq_cv_so_keepalive="yes"],
+ [libzmq_cv_so_keepalive="no"],
+ [libzmq_cv_so_keepalive="not during cross-compile"]
+ )]
)
+ AS_IF([test "x$libzmq_cv_so_keepalive" = "xyes"], [$1], [$2])
}])
dnl ################################################################################
@@ -653,8 +657,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPCNT([action-if-found], [action-if-not-found])
dnl # Check if TCP_KEEPCNT is supported #
dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPCNT], [{
- AC_MSG_CHECKING(whether TCP_KEEPCNT is supported)
- AC_TRY_RUN([/* TCP_KEEPCNT test */
+ AC_CACHE_CHECK([whether TCP_KEEPCNT is supported], [libzmq_cv_tcp_keepcnt],
+ [AC_TRY_RUN([/* TCP_KEEPCNT test */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -669,11 +673,13 @@ int main (int argc, char *argv [])
((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPCNT, (char*) &opt, sizeof (int))) == -1)
);
}
- ],
- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepcnt="yes" ; $1],
- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepcnt="no" ; $2],
- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepcnt="no"]
+ ],
+ [libzmq_cv_tcp_keepcnt="yes"],
+ [libzmq_cv_tcp_keepcnt="no"],
+ [libzmq_cv_tcp_keepcnt="not during cross-compile"]
+ )]
)
+ AS_IF([test "x$libzmq_cv_tcp_keepcnt" = "xyes"], [$1], [$2])
}])
dnl ################################################################################
@@ -681,8 +687,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPIDLE([action-if-found], [action-if-not-found])
dnl # Check if TCP_KEEPIDLE is supported #
dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPIDLE], [{
- AC_MSG_CHECKING(whether TCP_KEEPIDLE is supported)
- AC_TRY_RUN([/* TCP_KEEPIDLE test */
+ AC_CACHE_CHECK([whether TCP_KEEPIDLE is supported], [libzmq_cv_tcp_keepidle],
+ [AC_TRY_RUN([/* TCP_KEEPIDLE test */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -697,11 +703,13 @@ int main (int argc, char *argv [])
((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPIDLE, (char*) &opt, sizeof (int))) == -1)
);
}
- ],
- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepidle="yes" ; $1],
- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepidle="no" ; $2],
- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepidle="no"]
+ ],
+ [libzmq_cv_tcp_keepidle="yes"],
+ [libzmq_cv_tcp_keepidle="no"],
+ [libzmq_cv_tcp_keepidle="not during cross-compile"]
+ )]
)
+ AS_IF([test "x$libzmq_cv_tcp_keepidle" = "xyes"], [$1], [$2])
}])
dnl ################################################################################
@@ -709,8 +717,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPINTVL([action-if-found], [action-if-not-found])
dnl # Check if TCP_KEEPINTVL is supported #
dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPINTVL], [{
- AC_MSG_CHECKING(whether TCP_KEEPINTVL is supported)
- AC_TRY_RUN([/* TCP_KEEPINTVL test */
+ AC_CACHE_CHECK([whether TCP_KEEPINTVL is supported], [libzmq_cv_tcp_keepintvl],
+ [AC_TRY_RUN([/* TCP_KEEPINTVL test */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -725,11 +733,13 @@ int main (int argc, char *argv [])
((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPINTVL, (char*) &opt, sizeof (int))) == -1)
);
}
- ],
- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepintvl="yes" ; $1],
- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepintvl="no" ; $2],
- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepintvl="no"]
+ ],
+ [libzmq_cv_tcp_keepintvl="yes"],
+ [libzmq_cv_tcp_keepintvl="no"],
+ [libzmq_cv_tcp_keepintvl="not during cross-compile"]
+ )]
)
+ AS_IF([test "x$libzmq_cv_tcp_keepintvl" = "xyes"], [$1], [$2])
}])
dnl ################################################################################
@@ -737,8 +747,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPALIVE([action-if-found], [action-if-not-found])
dnl # Check if TCP_KEEPALIVE is supported #
dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPALIVE], [{
- AC_MSG_CHECKING(whether TCP_KEEPALIVE is supported)
- AC_TRY_RUN([/* TCP_KEEPALIVE test */
+ AC_CACHE_CHECK([whether TCP_KEEPALIVE is supported], [libzmq_cv_tcp_keepalive],
+ [AC_TRY_RUN([/* TCP_KEEPALIVE test */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -753,11 +763,13 @@ int main (int argc, char *argv [])
((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPALIVE, (char*) &opt, sizeof (int))) == -1)
);
}
- ],
- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepalive="yes" ; $1],
- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepalive="no" ; $2],
- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepalive="no"]
+ ],
+ [libzmq_cv_tcp_keepalive="yes"],
+ [libzmq_cv_tcp_keepalive="no"],
+ [libzmq_cv_tcp_keepalive="not during cross-compile"]
+ )]
)
+ AS_IF([test "x$libzmq_cv_tcp_keepalive" = "xyes"], [$1], [$2])
}])
dnl ################################################################################

View File

@@ -0,0 +1,29 @@
From e89577d30c278fba0f9e40266ceb6fb2821907d5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 13 May 2015 08:01:34 +0200
Subject: [PATCH] libzmq: Fix pkg-config files for static linking
Libzmq uses C++ standard library features, so users of it should link
against that as well when statically linking.
Add it to Libs.private so users using pkg-config automatically gets the
correct linker flags.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
src/libzmq.pc.in | 1 +
1 file changed, 1 insertions(+)
diff --git a/src/libzmq.pc.in b/src/libzmq.pc.in
index ba155a3..52a39f7 100644
--- a/src/libzmq.pc.in
+++ b/src/libzmq.pc.in
@@ -7,4 +7,5 @@ Name: libzmq
Description: 0MQ c++ library
Version: @VERSION@
Libs: -L${libdir} -lzmq
+Libs.private: -lstdc++
Cflags: -I${includedir}
--
2.1.4

View File

@@ -0,0 +1,73 @@
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

View File

@@ -0,0 +1,39 @@
comment "zeromq needs a toolchain w/ C++, wchar, threads"
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
BR2_TOOLCHAIN_HAS_THREADS)
config BR2_PACKAGE_ZEROMQ
bool "zeromq"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help
ØMQ (ZeroMQ, 0MQ, zmq) looks like an embeddable networking
library but acts like a concurrency framework. It gives you
sockets that carry whole messages across various transports
like in-process, inter- process, TCP, and multicast. You can
connect sockets N-to-N with patterns like fanout, pub-sub,
task distribution, and request-reply. It's fast enough to
be the fabric for clustered products. Its asynchronous I/O
model gives you scalable multicore applications, built as
asynchronous message-processing tasks. It has a score of
language APIs and runs on most operating systems.
ØMQ is from iMatix and is LGPL open source.
http://www.zeromq.org/
if BR2_PACKAGE_ZEROMQ
config BR2_PACKAGE_ZEROMQ_PGM
bool "PGM/EPGM support"
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX # openpgm
select BR2_PACKAGE_OPENPGM
help
Add support for Pragmatic General Multicast protocol (RFC 3208)
implemented either over raw IP packets or UDP datagrams
(encapsulated PGM). This requires OpenPGM library.
endif

View File

@@ -0,0 +1,4 @@
# From http://download.zeromq.org/SHA1SUMS:
sha1 b7185724f2fd56d0face50047757ac2a04d26ca4 zeromq-4.1.3.tar.gz
# Calculated based on the hash above
sha256 61b31c830db377777e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411 zeromq-4.1.3.tar.gz

View File

@@ -0,0 +1,44 @@
################################################################################
#
# zeromq
#
################################################################################
ZEROMQ_VERSION = 4.1.3
ZEROMQ_SITE = http://download.zeromq.org
ZEROMQ_INSTALL_STAGING = YES
ZEROMQ_DEPENDENCIES = util-linux
ZEROMQ_LICENSE = LGPLv3+ with exceptions
ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER
# For 0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch
ZEROMQ_AUTORECONF = YES
# Assume these flags are always available. It is true, at least for
# SOCK_CLOEXEC, since linux v2.6.27.
# Note: the flag TCP_KEEPALIVE is NOT available so we do not include it.
ZEROMQ_CONF_ENV = libzmq_cv_sock_cloexec=yes \
libzmq_cv_so_keepalive=yes \
libzmq_cv_tcp_keepcnt=yes \
libzmq_cv_tcp_keepidle=yes \
libzmq_cv_tcp_keepintvl=yes
# Only tools/curve_keygen.c needs this, but it doesn't hurt to pass it
# for the rest of the build as well (which automatically includes stdc++).
ifeq ($(BR2_STATIC_LIBS),y)
ZEROMQ_CONF_OPTS += LIBS=-lstdc++
endif
ifeq ($(BR2_PACKAGE_ZEROMQ_PGM),y)
ZEROMQ_DEPENDENCIES += host-pkgconf openpgm
ZEROMQ_CONF_OPTS += --with-system-pgm
endif
# ZeroMQ uses libsodium if it's available.
ifeq ($(BR2_PACKAGE_LIBSODIUM),y)
ZEROMQ_DEPENDENCIES += libsodium
ZEROMQ_CONF_OPTS += --with-libsodium="$(STAGING_DIR)/usr"
else
ZEROMQ_CONF_OPTS += --without-libsodium
endif
$(eval $(autotools-package))