From 0697d1544bdacec0dea3f59742d2be9f9696dc44216fd8aa1fdd0b28189eef84 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 24 Oct 2023 09:17:27 +0000 Subject: [PATCH 1/3] - update to 4.3.5: * Relicensing from LGPL-3.0+ (with custom exceptions) to MPL-2.0 is now complete. libzmq is now distributed under the Mozilla Public License 2.0. Relicensing grants have been collected from all relevant authors, and some functionality has been clean-room reimplemented where that was not possible. In layman terms, the new license provides the same rights and obligations as before. Source files are now tagged using the SPDX license identifier format. Details of the relicensing process can be seen at: #2376 Relicensing grants have been archived at: https://github.com/rlenferink/libzmq-relicense A special thanks to everybody who helped with this long and difficult task, with the process, the reimplementations, the collections and everything else. * New DRAFT (see NEWS for 4.2.0) socket options: ZMQ_BUSY_POLL will set the SO_BUSY_POLL socket option on the underlying sockets, if it is supported. ZMQ_HICCUP_MSG will send a message when the peer has been disconnected. ZMQ_XSUB_VERBOSE_UNSUBSCRIBE will configure a socket to pass all unsubscription messages, including duplicated ones. ZMQ_TOPICS_COUNT will return the number of subscribed topics on a PUB/SUB socket. ZMQ_NORM_MODE, ZMQ_NORM_UNICAST_NACK, ZMQ_NORM_BUFFER_SIZE, ZMQ_NORM_SEGMENT_SIZE, ZMQ_NORM_BLOCK_SIZE, ZMQ_NORM_NUM_PARITY, ZMQ_NORM_NUM_AUTOPARITY and ZMQ_NORM_PUSH to control various aspect of NORM sockets. See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details. * New DRAFT (see NEWS for 4.2.0) zmq_ppoll APIs was added that differs from zmq_poll in the same way that ppoll differs from poll. See doc/zmq_ppoll.txt for details. * Various bug fixes and performance improvements. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zeromq?expand=0&rev=84 --- zeromq-4.3.4.tar.gz | 3 --- zeromq-4.3.5.tar.gz | 3 +++ zeromq.changes | 33 +++++++++++++++++++++++++++++++++ zeromq.spec | 4 ++-- 4 files changed, 38 insertions(+), 5 deletions(-) delete mode 100644 zeromq-4.3.4.tar.gz create mode 100644 zeromq-4.3.5.tar.gz diff --git a/zeromq-4.3.4.tar.gz b/zeromq-4.3.4.tar.gz deleted file mode 100644 index 6013a51..0000000 --- a/zeromq-4.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5 -size 2486520 diff --git a/zeromq-4.3.5.tar.gz b/zeromq-4.3.5.tar.gz new file mode 100644 index 0000000..aa0294f --- /dev/null +++ b/zeromq-4.3.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 +size 2530237 diff --git a/zeromq.changes b/zeromq.changes index 83c7b9e..689ab77 100644 --- a/zeromq.changes +++ b/zeromq.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue Oct 24 09:13:45 UTC 2023 - Adam Majer + +- update to 4.3.5: + * Relicensing from LGPL-3.0+ (with custom exceptions) to MPL-2.0 is now complete. + libzmq is now distributed under the Mozilla Public License 2.0. Relicensing + grants have been collected from all relevant authors, and some functionality + has been clean-room reimplemented where that was not possible. In layman terms, + the new license provides the same rights and obligations as before. Source + files are now tagged using the SPDX license identifier format. + Details of the relicensing process can be seen at: #2376 + Relicensing grants have been archived at: + https://github.com/rlenferink/libzmq-relicense + A special thanks to everybody who helped with this long and difficult task, + with the process, the reimplementations, the collections and everything else. + * New DRAFT (see NEWS for 4.2.0) socket options: + ZMQ_BUSY_POLL will set the SO_BUSY_POLL socket option on the underlying + sockets, if it is supported. + ZMQ_HICCUP_MSG will send a message when the peer has been disconnected. + ZMQ_XSUB_VERBOSE_UNSUBSCRIBE will configure a socket to pass all + unsubscription messages, including duplicated ones. + ZMQ_TOPICS_COUNT will return the number of subscribed topics on a + PUB/SUB socket. + ZMQ_NORM_MODE, ZMQ_NORM_UNICAST_NACK, ZMQ_NORM_BUFFER_SIZE, + ZMQ_NORM_SEGMENT_SIZE, ZMQ_NORM_BLOCK_SIZE, ZMQ_NORM_NUM_PARITY, + ZMQ_NORM_NUM_AUTOPARITY and ZMQ_NORM_PUSH to control various aspect of + NORM sockets. + See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details. + * New DRAFT (see NEWS for 4.2.0) zmq_ppoll APIs was added that differs from + zmq_poll in the same way that ppoll differs from poll. + See doc/zmq_ppoll.txt for details. + * Various bug fixes and performance improvements. + ------------------------------------------------------------------- Mon Jan 23 15:42:18 UTC 2023 - Andreas Schwab diff --git a/zeromq.spec b/zeromq.spec index 719246d..01008ae 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -23,10 +23,10 @@ %bcond_with pgm %endif Name: zeromq -Version: 4.3.4 +Version: 4.3.5 Release: 0 Summary: Lightweight messaging kernel -License: LGPL-3.0-or-later +License: MPL-2.0 Group: Productivity/Networking/Web/Servers URL: http://www.zeromq.org/ Source: https://github.com/zeromq/libzmq/releases/download/v%{version}/zeromq-%{version}.tar.gz From ceae64d56108d729be72bce012ce106e28f7265acd3285349011af720151f80c Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 24 Oct 2023 09:23:49 +0000 Subject: [PATCH 2/3] - qemu-user.patch: upstreamed, removed OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zeromq?expand=0&rev=85 --- qemu-user.patch | 64 ------------------------------------------------- zeromq.changes | 2 ++ zeromq.spec | 2 -- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 qemu-user.patch diff --git a/qemu-user.patch b/qemu-user.patch deleted file mode 100644 index 6679c6b..0000000 --- a/qemu-user.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 48960c229388980fafa4528f9e7511fca972ff3b Mon Sep 17 00:00:00 2001 -From: Han Gao -Date: Tue, 10 Jan 2023 01:12:20 +0800 -Subject: [PATCH] fix: fix build on qemu-user - -In qemu-user, CACHELINE_SIZE probe is undefined - -Signed-off-by: Han Gao ---- - CMakeLists.txt | 3 ++- - RELICENSE/hangao.md | 13 +++++++++++++ - acinclude.m4 | 2 +- - 3 files changed, 16 insertions(+), 2 deletions(-) - create mode 100644 RELICENSE/hangao.md - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8672d617..072a6507 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -481,7 +481,8 @@ execute_process( - ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - if(CACHELINE_SIZE STREQUAL "" - OR CACHELINE_SIZE EQUAL 0 -- OR CACHELINE_SIZE EQUAL -1) -+ OR CACHELINE_SIZE EQUAL -1 -+ OR CACHELINE_SIZE EQUAL "undefined") - set(ZMQ_CACHELINE_SIZE 64) - else() - set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE}) -diff --git a/RELICENSE/hangao.md b/RELICENSE/hangao.md -new file mode 100644 -index 00000000..de100bb5 ---- /dev/null -+++ b/RELICENSE/hangao.md -@@ -0,0 +1,13 @@ -+# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL -+ -+This is a statement by Han Gao that grants permission to relicense its copyrights in the libzmq C++ -+library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other -+Open Source Initiative approved license chosen by the current ZeroMQ -+BDFL (Benevolent Dictator for Life). -+ -+A portion of the commits made by the Github handle "Rabenda", with -+commit author "Han Gao " or "Han Gao ", are copyright of Han Gao . -+This document hereby grants the libzmq project team to relicense libzmq, -+including all past, present and future contributions of the author listed above. -+ -+Han Gao 2023/01/10 -diff --git a/acinclude.m4 b/acinclude.m4 -index ac55776e..f27fc8e8 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1254,7 +1254,7 @@ AC_DEFUN([LIBZMQ_CHECK_CACHELINE], [{ - AC_CHECK_TOOL(libzmq_getconf, getconf) - if ! test "x$libzmq_getconf" = "x"; then - zmq_cacheline_size=$($libzmq_getconf LEVEL1_DCACHE_LINESIZE 2>/dev/null || echo 64) -- if test "x$zmq_cacheline_size" = "x0" -o "x$zmq_cacheline_size" = "x-1"; then -+ if test "x$zmq_cacheline_size" = "x0" -o "x$zmq_cacheline_size" = "x-1" -o "x$zmq_cacheline_size" = "xundefined"; then - # getconf on some architectures does not know the size, try to fallback to - # the value the kernel knows on Linux - zmq_cacheline_size=$(cat /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size 2>/dev/null || echo 64) --- -2.39.1 - diff --git a/zeromq.changes b/zeromq.changes index 689ab77..b447f0b 100644 --- a/zeromq.changes +++ b/zeromq.changes @@ -31,6 +31,8 @@ Tue Oct 24 09:13:45 UTC 2023 - Adam Majer See doc/zmq_ppoll.txt for details. * Various bug fixes and performance improvements. +- qemu-user.patch: upstreamed, removed + ------------------------------------------------------------------- Mon Jan 23 15:42:18 UTC 2023 - Andreas Schwab diff --git a/zeromq.spec b/zeromq.spec index 01008ae..da9342e 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -31,7 +31,6 @@ Group: Productivity/Networking/Web/Servers URL: http://www.zeromq.org/ Source: https://github.com/zeromq/libzmq/releases/download/v%{version}/zeromq-%{version}.tar.gz Source99: baselibs.conf -Patch1: qemu-user.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -105,7 +104,6 @@ This package holds the development files for ZeroMQ. %prep %setup -q -%patch1 -p1 %build autoreconf -fi From 15a20b92de917e452d52ef42289383412c9b1a148d9abb1b601ccc1a31ab4292 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 24 Oct 2023 09:32:20 +0000 Subject: [PATCH 3/3] fix license reference OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zeromq?expand=0&rev=86 --- zeromq.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/zeromq.spec b/zeromq.spec index da9342e..2861103 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -135,19 +135,16 @@ make check %{?_smp_mflags} || make check || make check || make check || (cat ./t %files -n %{lib_name} %defattr(-,root,root,-) -%license COPYING COPYING.LESSER +%license LICENSE %{_libdir}/libzmq.so.* %files tools %defattr(-,root,root) -%license COPYING COPYING.LESSER -%defattr(-,root,root,-) %{_bindir}/curve_keygen %files devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS -%license COPYING COPYING.LESSER %{_includedir}/zmq* %{_libdir}/libzmq.so %{_libdir}/pkgconfig/libzmq.pc