From 13c901b7afbebd5fc92ef5fb8bdc466b145abb60 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Tue, 24 Oct 2023 20:29:42 +0200 Subject: [PATCH 01/15] Revert "CMake / Improved the build" This reverts commit b80422b75f353bdd12edeb8b05a81ac78add223a. --- zeromq.spec | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/zeromq.spec b/zeromq.spec index d581cf4..0bc3d97 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -26,7 +26,6 @@ BuildRequires: openpgm-devel BuildRequires: krb5-devel %endif -# https://github.com/zeromq/libzmq/pull/4609 - Upgrade of CMake files Patch0: zeromq-fix-cmake-warnings.patch %description @@ -49,12 +48,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package doc -Summary: HTML documentation for the %{name} library -BuildArch: noarch - -%description doc -This package contains HTML pages for %{name}. %prep %autosetup -p1 @@ -75,20 +68,6 @@ chmod -x src/xsub.hpp %install %cmake_install -# Doc -mv -f %{buildroot}/usr/doc/zmq %{buildroot}%{_docdir}/ - -# Manual pages -install -d %{buildroot}%{_mandir}/{man3,man7} -install -pm 0644 doc/*.3 %{buildroot}%{_mandir}/man3/ -install -pm 0644 doc/*.7 %{buildroot}%{_mandir}/man7/ - -# Static library -rm -f %{buildroot}%{_libdir}/libzmq.a - -# Unused binaries -rm -f %{buildroot}%{_bindir}/{inproc_lat,inproc_thr,local_lat,local_thr,proxy_thr,remote_lat,remote_thr} - %check %ifnarch s390x %ctest @@ -100,7 +79,7 @@ make check V=1 || ( cat test-suite.log && exit 1 ) %files %doc README.md AUTHORS NEWS %license LICENSE -#%%{_bindir}/curve_keygen +%{_bindir}/curve_keygen %{_libdir}/libzmq.so.5* %{_mandir}/man3/zmq_* %{_mandir}/man7/zmq_* @@ -110,10 +89,7 @@ make check V=1 || ( cat test-suite.log && exit 1 ) %{_libdir}/libzmq.so %{_libdir}/pkgconfig/libzmq.pc %{_includedir}/zmq*.h -%{_libdir}/cmake/ZeroMQ/ - -%files doc -%{_docdir}/zmq/ +%{_libdir}/cmake/ZeroMQ %changelog %autochangelog From 3dd626ffa022b1acc1627ef1ce762d206fd445c9 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Tue, 24 Oct 2023 20:30:24 +0200 Subject: [PATCH 02/15] Revert "BZ#2245747 - Build system switched to CMake" This reverts commit 0a97bab77b0ebadedd9dc193c415627ca2a074c1. --- zeromq-fix-cmake-warnings.patch | 50 --------------------------------- zeromq.spec | 39 +++++++++++++++++-------- 2 files changed, 27 insertions(+), 62 deletions(-) delete mode 100644 zeromq-fix-cmake-warnings.patch diff --git a/zeromq-fix-cmake-warnings.patch b/zeromq-fix-cmake-warnings.patch deleted file mode 100644 index 8b228b6..0000000 --- a/zeromq-fix-cmake-warnings.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c64ccc1f..deae8efe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,12 +1,7 @@ - # CMake build script for ZeroMQ -+cmake_minimum_required(VERSION 3.5..3.27) - project(ZeroMQ) - --if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin) -- cmake_minimum_required(VERSION 3.0.2) --else() -- cmake_minimum_required(VERSION 2.8.12) --endif() -- - include(CheckIncludeFiles) - include(CheckCCompilerFlag) - include(CheckCXXCompilerFlag) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index c1bda3bd..ce157c1e 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,10 +1,15 @@ - # CMake build script for ZeroMQ tests --cmake_minimum_required(VERSION "2.8.1") -+cmake_minimum_required(VERSION 3.5..3.27) - - # On Windows: solution file will be called tests.sln - project(tests) - - set(tests -+ test_bind_stream_fuzzer -+ test_bind_ws_fuzzer -+ test_connect_stream_fuzzer -+ test_connect_ws_fuzzer -+ test_socket_options_fuzzer - test_ancillaries - test_system - test_pair_inproc -diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index 7132f00b..f76c3a1b 100644 ---- a/unittests/CMakeLists.txt -+++ b/unittests/CMakeLists.txt -@@ -1,5 +1,5 @@ - # CMake build script for ZeroMQ unit tests --cmake_minimum_required(VERSION "2.8.1") -+cmake_minimum_required(VERSION 3.5..3.27) - - set(unittests - unittest_ypipe diff --git a/zeromq.spec b/zeromq.spec index 0bc3d97..97f48c5 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -10,12 +10,14 @@ License: MPLv2.0 AND BSD-3-Clause AND MIT URL: https://zeromq.org Source0: https://github.com/%{name}/libzmq/archive/v%{version}/%{name}-%{version}.tar.gz +BuildRequires: make +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: cmake +BuildRequires: libtool BuildRequires: asciidoc BuildRequires: xmlto BuildRequires: libsodium-devel -BuildRequires: gnutls-devel %if %{with unwind} BuildRequires: libunwind-devel @@ -26,8 +28,6 @@ BuildRequires: openpgm-devel BuildRequires: krb5-devel %endif -Patch0: zeromq-fix-cmake-warnings.patch - %description The 0MQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by @@ -60,22 +60,37 @@ chmod -x src/xsub.hpp %build -%cmake -#cmake -DENABLE_CURVE:BOOL=ON -DWITH_LIBSODIUM:BOOL=ON -DWITH_OPENPGM:BOOL=ON .. +autoreconf -fi +%configure \ +%if %{with pgm} + --with-pgm \ + --with-libgssapi_krb5 \ +%endif + --with-libsodium \ +%if %{with unwind} + --enable-libunwind \ +%endif + --disable-Werror \ + --disable-static +%make_build -%cmake_build %install -%cmake_install +%make_install + +# remove *.la +rm %{buildroot}%{_libdir}/libzmq.la + %check -%ifnarch s390x -%ctest -%endif %ifarch s390x make check V=1 || ( cat test-suite.log && exit 1 ) %endif + +%ldconfig_scriptlets + + %files %doc README.md AUTHORS NEWS %license LICENSE @@ -89,7 +104,7 @@ make check V=1 || ( cat test-suite.log && exit 1 ) %{_libdir}/libzmq.so %{_libdir}/pkgconfig/libzmq.pc %{_includedir}/zmq*.h -%{_libdir}/cmake/ZeroMQ + %changelog %autochangelog From 9e6802e3b7168475f41546a4b07fc6bf502f5be2 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 31 Oct 2023 12:51:38 +0100 Subject: [PATCH 03/15] Enable draft API (rhbz#2247171) --- zeromq.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zeromq.spec b/zeromq.spec index 97f48c5..2d41825 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -67,6 +67,7 @@ autoreconf -fi --with-libgssapi_krb5 \ %endif --with-libsodium \ + --enable-drafts \ %if %{with unwind} --enable-libunwind \ %endif From 04ba3e0b7edcf3e2052e6e2d1bf0cafa2caf1c91 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Tue, 31 Oct 2023 15:13:53 +0100 Subject: [PATCH 04/15] BZ#2247171 / PR#7 - Added the --enable-drafts option by default --- zeromq.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zeromq.spec b/zeromq.spec index 2d41825..158f4c7 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -67,7 +67,9 @@ autoreconf -fi --with-libgssapi_krb5 \ %endif --with-libsodium \ +%ifnarch s390x --enable-drafts \ +%endif %if %{with unwind} --enable-libunwind \ %endif From 0502eb19600dd1d9e19a5ac05cbcb87ebb94cdfd Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 31 Oct 2023 17:59:45 +0100 Subject: [PATCH 05/15] XFAIL the faileing tests/test_radio_dish --- zeromq.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zeromq.spec b/zeromq.spec index 158f4c7..6b7df88 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -67,9 +67,7 @@ autoreconf -fi --with-libgssapi_krb5 \ %endif --with-libsodium \ -%ifnarch s390x --enable-drafts \ -%endif %if %{with unwind} --enable-libunwind \ %endif @@ -87,7 +85,7 @@ rm %{buildroot}%{_libdir}/libzmq.la %check %ifarch s390x -make check V=1 || ( cat test-suite.log && exit 1 ) +make check V=1 XFAIL_TESTS=tests/test_radio_dish || ( cat test-suite.log && exit 1 ) %endif From d1f897dccf492ea2955e426826903e4b91d8c71b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 29 Nov 2023 14:33:04 +0100 Subject: [PATCH 06/15] Build with _DEFAULT_SOURCE to avoid compatibility issue --- zeromq-configure-c99.patch | 37 +++++++++++++++++++++++++++++++++++++ zeromq.spec | 1 + 2 files changed, 38 insertions(+) create mode 100644 zeromq-configure-c99.patch diff --git a/zeromq-configure-c99.patch b/zeromq-configure-c99.patch new file mode 100644 index 0000000..0bee83b --- /dev/null +++ b/zeromq-configure-c99.patch @@ -0,0 +1,37 @@ +Build with -D_DEFAULT_SOURCE along with -std=c11 + +On its own, -std=c11 hides POSIX and other extensions from C headers +such as when building against glibc. This causes the +posix_memalign probe to fail incorrectly with compilers that do not +accept implicit function declarations. _DEFAULT_SOURCE is ignored by +most non-GNU/Linux systems or not relevant in this context, so there +is no separate check for adding it. + +Submitted upstream: + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 68fb7251..f956f3fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,7 +122,7 @@ if (NOT MSVC) + if(NOT CMAKE_C_FLAGS MATCHES "-std=" AND NOT C_STANDARD AND NOT CMAKE_C_STANDARD) + check_c_compiler_flag("-std=c11" COMPILER_SUPPORTS_C11) + if(COMPILER_SUPPORTS_C11) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -std=c11") + else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + endif() +diff --git a/configure.ac b/configure.ac +index b9e13d4f..ffcc145b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -66,7 +66,7 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}" + + # Checks for programs. + AC_PROG_CC +-AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11"], [AC_PROG_CC_C99]) ++AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11 -D_DEFAULT_SOURCE"], [AC_PROG_CC_C99]) + AC_PROG_CXX + AX_CODE_COVERAGE + AM_PROG_CC_C_O diff --git a/zeromq.spec b/zeromq.spec index 6b7df88..18794f8 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -9,6 +9,7 @@ Summary: Software library for fast, message-based applications License: MPLv2.0 AND BSD-3-Clause AND MIT URL: https://zeromq.org Source0: https://github.com/%{name}/libzmq/archive/v%{version}/%{name}-%{version}.tar.gz +Patch1: zeromq-configure-c99.patch BuildRequires: make BuildRequires: autoconf From 1cb438733f354aa156b0eeee6fb0dcdc0b19aba2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:04:44 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1bc5134706ec9dcb1e79a35eec857d53ac6e654e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:50:50 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c8ae1309ae00141d9a2f296d279ca1dd74868a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Sun, 8 Sep 2024 20:06:32 +0000 Subject: [PATCH 09/15] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 If there will be no comments in two weeks, I will merge this. --- zeromq.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeromq.spec b/zeromq.spec index 18794f8..a4f31f1 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -6,7 +6,7 @@ Version: 4.3.5 Release: %autorelease Summary: Software library for fast, message-based applications -License: MPLv2.0 AND BSD-3-Clause AND MIT +License: MPL-2.0 AND BSD-3-Clause AND MIT URL: https://zeromq.org Source0: https://github.com/%{name}/libzmq/archive/v%{version}/%{name}-%{version}.tar.gz Patch1: zeromq-configure-c99.patch From cb016e731716d3ce6779fcb2ae0f9039800a5f79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:44:36 +0000 Subject: [PATCH 10/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2ba6425a00ea0b2667a8aeb9b275df4d9c66b208 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Mon, 27 Jan 2025 23:08:26 +0100 Subject: [PATCH 11/15] Rebuild for OpenPGM --- zeromq.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zeromq.spec b/zeromq.spec index a4f31f1..cb4276c 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -1,3 +1,4 @@ +# %bcond_without pgm %bcond_without unwind From 5cdfb5dc7a90d61a8116cf0b52d9540289101988 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Tue, 28 Jan 2025 11:40:11 +0100 Subject: [PATCH 12/15] Rebuild for OpenPGM in a side tag --- zeromq.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zeromq.spec b/zeromq.spec index cb4276c..a4f31f1 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -1,4 +1,3 @@ -# %bcond_without pgm %bcond_without unwind From 8c0a9a27441bfb3f15dde5ba86ebe72d92c5ba79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:17:35 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 61dda03ad695d60509ccfa414709aea4ce120068 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:07:36 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 2b568b01363eff740cc72599500094aab3073dc8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:39:57 +0000 Subject: [PATCH 15/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild