Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
fdf335e781
!17 【轻量级 PR】:fix bogus date in %changelog
From: @k4b00m 
Reviewed-by: @wk333 
Signed-off-by: @wk333
2024-02-04 09:27:07 +00:00
ckji
1250b42755 fix bogus date in %changelog 2023-01-29 17:36:20 +08:00
openeuler-ci-bot
c55bdbb9f6
!14 [sync] PR-11: Fix build error
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-09-14 09:28:34 +00:00
starlet-dx
60f2698d9d Fix build error
(cherry picked from commit 5def696cd45e8a76fbc0159d501cc4d997df16ba)
2022-09-14 16:55:12 +08:00
openeuler-ci-bot
f442cf1703
!10 [sync] PR-7: fix test_inproc_connect failed
From: @openeuler-sync-bot 
Reviewed-by: @myeuler 
Signed-off-by: @myeuler
2022-09-09 03:43:15 +00:00
cherry530
6847d75f77 fix test_inproc_connect failed
Signed-off-by: cherry530 <xuping33@huawei.com>
(cherry picked from commit 442a0f27266901df5788ebf6754d51dd71fba109)
2022-08-19 10:20:26 +08:00
openeuler-ci-bot
bae0737f27 !2 upgrade to 4.3.4
From: @jackie_wu123
Reviewed-by: @licihua
Signed-off-by: @licihua
2021-06-05 14:31:22 +08:00
jackie_wu
b4a5fbe174 upgrade zeromq to 4.3.4 2021-06-04 16:18:28 +08:00
openeuler-ci-bot
d5365b08bf !1 Package init
Merge pull request !1 from seki099/shijian
2020-03-09 10:00:22 +08:00
seki099
784feeb5c8 package init 2020-03-09 09:55:51 +08:00
3 changed files with 167 additions and 0 deletions

View File

@ -0,0 +1,59 @@
From de03c9a6ab3976cea614d0cdc9398bd0bbb63bc9 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Sun, 13 Jun 2021 17:45:57 +0100
Subject: [PATCH] Problem: test_inproc_connect occasionally fails on slow archs
Solution: actually send a message rather than just opening/closing
the sockets, as connecting is asynchronous.
tests/test_inproc_connect.cpp:341:test_bind_before_connect:PASS
tests/test_inproc_connect.cpp:342:test_connect_before_bind:PASS
tests/test_inproc_connect.cpp:343:test_connect_before_bind_pub_sub:PASS
tests/test_inproc_connect.cpp:344:test_connect_before_bind_ctx_term:PASS
tests/test_inproc_connect.cpp:345:test_multiple_connects:PASS
tests/test_inproc_connect.cpp:346:test_multiple_threads:PASS
Assertion failed: _state == active || _state == waiting_for_delimiter (src/pipe.cpp:504)
0 0xffffa015d3e4 in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::zmq_abort(char const*)+0xc)
1 0xffffa017b208 in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::pipe_t::process_delimiter()+0xb0)
2 0xffffa017b420 in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::pipe_t::read(zmq::msg_t*)+0xd8)
3 0xffffa01a4b28 in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::xpub_t::xread_activated(zmq::pipe_t*)+0x110)
4 0xffffa01a3758 in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::xpub_t::xattach_pipe(zmq::pipe_t*, bool, bool)+0x68)
5 0xffffa018dc3c in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::socket_base_t::attach_pipe(zmq::pipe_t*, bool, bool)+0x94)
6 0xffffa016f288 in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::object_t::process_command(zmq::command_t const&)+0x148)
7 0xffffa014ee3c in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::ctx_t::connect_inproc_sockets(zmq::socket_base_t*, zmq::options_t const&, zmq::ctx_t::pending_connection_t const&, zmq::ctx_t::side)+0xdc)
8 0xffffa0150bec in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::ctx_t::connect_pending(char const*, zmq::socket_base_t*)+0x1fc)
9 0xffffa0190034 in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (zmq::socket_base_t::bind(char const*)+0x3e4)
10 0xaaaae50475d8 in /usr/src/packages/BUILD/tests/.libs/test_inproc_connect (simult_bind(void*)+0x28)
11 0xffffa019bfb8 in /usr/src/packages/BUILD/src/.libs/libzmq.so.5 (thread_routine+0x70)
12 0xffffa00e07e4 in /lib/aarch64-linux-gnu/libpthread.so.0 (start_thread+0x18c)
13 0xffff9fdcab2c in /lib/aarch64-linux-gnu/libc.so.6 (clone+0x5c)
---
tests/test_inproc_connect.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/test_inproc_connect.cpp b/tests/test_inproc_connect.cpp
index de1923fb77..7a3acbda8c 100644
--- a/tests/test_inproc_connect.cpp
+++ b/tests/test_inproc_connect.cpp
@@ -54,8 +54,9 @@ static void simult_conn (void *endpt_)
// Connect
// do not use test_context_socket here, as it is not thread-safe
- void *connect_socket = zmq_socket (get_test_context (), ZMQ_SUB);
+ void *connect_socket = zmq_socket (get_test_context (), ZMQ_PAIR);
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, endpt));
+ recv_string_expect_success (connect_socket, "foobar", 0);
// Cleanup
TEST_ASSERT_SUCCESS_ERRNO (zmq_close (connect_socket));
@@ -68,8 +69,9 @@ static void simult_bind (void *endpt_)
// Bind
// do not use test_context_socket here, as it is not thread-safe
- void *bind_socket = zmq_socket (get_test_context (), ZMQ_PUB);
+ void *bind_socket = zmq_socket (get_test_context (), ZMQ_PAIR);
TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, endpt));
+ send_string_expect_success (bind_socket, "foobar", 0);
// Cleanup
TEST_ASSERT_SUCCESS_ERRNO (zmq_close (bind_socket));

BIN
libzmq-4.3.4.tar.gz Normal file

Binary file not shown.

108
zeromq.spec Normal file
View File

@ -0,0 +1,108 @@
Name: zeromq
Version: 4.3.4
Release: 3
Summary: Software library for fast, message-based applications
License: LGPLv3+
URL: https://zeromq.org
Source0: https://github.com/%{name}/libzmq/archive/v%{version}/libzmq-%{version}.tar.gz
Patch0000: fix-test_inproc_connect-occasionally-fails-on-slow-archs.patch
BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: asciidoc
BuildRequires: xmlto
BuildRequires: libsodium-devel
BuildRequires: libunwind-devel
BuildRequires: openpgm-devel
BuildRequires: krb5-devel
%description
The 0MQ lightweight messaging kernel is a library which extends the
standard socket interfaces with features traditionally provided by
specialized messaging middle-ware products. 0MQ sockets provide an
abstraction of asynchronous message queues, multiple messaging
patterns, message filtering (subscriptions), seamless access to
multiple transport protocols and more.
This package contains the ZeroMQ shared library.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package help
Summary: Help documents for zeromq
%description help
Help documents for zeromq.
%prep
%autosetup -p1 -n libzmq-%{version}
rm -rf external/wepoll
chmod -x src/xsub.hpp
%build
autoreconf -fi
%configure \
--with-pgm \
--with-libgssapi_krb5 \
--with-libsodium \
--enable-libunwind \
--disable-Werror \
--disable-static
%make_build
%install
%make_install
rm %{buildroot}%{_libdir}/libzmq.la
%check
make check %{?_smp_mflags} || make check || make check || make check || ( cat test-suite.log && exit 1 )
%ldconfig_scriptlets
%files
%doc AUTHORS
%{_bindir}/curve_keygen
%{_libdir}/libzmq.so.5*
%files devel
%{_libdir}/libzmq.so
%{_libdir}/pkgconfig/libzmq.pc
%{_includedir}/zmq*.h
%files help
%doc README.md NEWS
%license COPYING COPYING.LESSER
%{_mandir}/man3/zmq_*
%{_mandir}/man7/zmq_*
%{_mandir}/man7/zmq.*
%changelog
* Tue Aug 23 2022 yaoxin <yaoxin30@h-partners.com> - 4.3.4-3
- Fix build error
* Fri Aug 19 2022 xu_ping <xuping33@h-partners.com> - 4.3.4-2
- fix test_inproc_connext failed
* Fri Jun 4 2021 wutao <wutao61@huawei.com> - 4.3.4-1
- upgrade to 4.3.4 to fix CVE-2021-20236
* Fri Mar 6 2020 shijian <shijian16@huawei.com> - 4.1.7-2
- Package init