Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zmq: update to version 4.3.3 (security fix)

Browse source 
Fixes
CVE-2020-15166

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
This commit is contained in:
Jan Pavlinec 2020-09-15 12:42:12 +02:00
parent da183bdb3d
commit c2ffadb928
No known key found for this signature in database
GPG key ID: 60244CCEFB39E584
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/zmq/Makefile
View file

@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=zeromq PKG_NAME:=zeromq
PKG_VERSION:=4.3.2 PKG_VERSION:=4.3.3
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/zeromq/libzmq/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/zeromq/libzmq/releases/download/v$(PKG_VERSION)
PKG_HASH:=ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763 PKG_HASH:=9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2
PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com> PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later

40
libs/zmq/patches/010-uclibcxx.patch
View file

@ -8,13 +8,13 @@
-#if __cplusplus >= 201103L -#if __cplusplus >= 201103L
+#include <ios> +#include <ios>
+#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) +#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__)
#include "radix_tree.hpp" #include "radix_tree.hpp"
#include "trie.hpp" #include "trie.hpp"
--- a/src/atomic_counter.hpp --- a/src/atomic_counter.hpp
+++ b/src/atomic_counter.hpp +++ b/src/atomic_counter.hpp
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#if defined ZMQ_FORCE_MUTEXES #if defined ZMQ_FORCE_MUTEXES
#define ZMQ_ATOMIC_COUNTER_MUTEX #define ZMQ_ATOMIC_COUNTER_MUTEX
-#elif (defined __cplusplus && __cplusplus >= 201103L) \ -#elif (defined __cplusplus && __cplusplus >= 201103L) \
@ -25,7 +25,7 @@
--- a/src/atomic_ptr.hpp --- a/src/atomic_ptr.hpp
+++ b/src/atomic_ptr.hpp +++ b/src/atomic_ptr.hpp
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
#if defined ZMQ_FORCE_MUTEXES #if defined ZMQ_FORCE_MUTEXES
#define ZMQ_ATOMIC_PTR_MUTEX #define ZMQ_ATOMIC_PTR_MUTEX
-#elif (defined __cplusplus && __cplusplus >= 201103L) \ -#elif (defined __cplusplus && __cplusplus >= 201103L) \
@ -38,34 +38,23 @@
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
#include <algorithm> #include <algorithm>
#include <ios> #include <ios>
-#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER > 1700 -#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER > 1700
+#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) || defined(_MSC_VER) && _MSC_VER > 1700 +#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) || defined(_MSC_VER) && _MSC_VER > 1700
#define ZMQ_HAS_MOVE_SEMANTICS #define ZMQ_HAS_MOVE_SEMANTICS
#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v) #define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v)
#define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back #define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -544,7 +544,7 @@ void zmq::ctx_t::unregister_endpoints (socket_base_t *socket_)
end = _endpoints.end ();
it != end;) {
if (it->second.socket == socket_)
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__)
it = _endpoints.erase (it);
#else
_endpoints.erase (it++);
--- a/src/msg.hpp --- a/src/msg.hpp
+++ b/src/msg.hpp +++ b/src/msg.hpp
@@ -30,8 +30,8 @@ @@ -30,8 +30,8 @@
#ifndef __ZMQ_MSG_HPP_INCLUDE__ #ifndef __ZMQ_MSG_HPP_INCLUDE__
#define __ZMQ_MSG_HPP_INCLUDE__ #define __ZMQ_MSG_HPP_INCLUDE__
-#include <stddef.h> -#include <stddef.h>
-#include <stdio.h> -#include <stdio.h>
+#include <cstddef> +#include <cstddef>
+#include <cstdio> +#include <cstdio>
#include "config.hpp" #include "config.hpp"
#include "err.hpp" #include "err.hpp"
--- a/src/options.hpp --- a/src/options.hpp
@ -79,14 +68,25 @@
static_assert (std::is_trivially_copyable<T>::value, static_assert (std::is_trivially_copyable<T>::value,
"invalid use of do_getsockopt"); "invalid use of do_getsockopt");
#endif #endif
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -725,7 +725,7 @@ void zmq::ctx_t::unregister_endpoints (c
end = _endpoints.end ();
it != end;) {
if (it->second.socket == socket_)
-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
+#if (__cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)) && !defined(__UCLIBCXX_MAJOR__)
it = _endpoints.erase (it);
#else
_endpoints.erase (it++);
--- a/src/radio.cpp --- a/src/radio.cpp
+++ b/src/radio.cpp +++ b/src/radio.cpp
@@ -126,7 +126,7 @@ void zmq::radio_t::xpipe_terminated (pipe_t *pipe_) @@ -126,7 +126,7 @@ void zmq::radio_t::xpipe_terminated (pip
end = _subscriptions.end (); end = _subscriptions.end ();
it != end;) { it != end;) {
if (it->second == pipe_) { if (it->second == pipe_) {
-#if __cplusplus >= 201103L -#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
+#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) +#if (__cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)) && !defined(__UCLIBCXX_MAJOR__)
it = _subscriptions.erase (it); it = _subscriptions.erase (it);
#else #else
_subscriptions.erase (it++); _subscriptions.erase (it++);