From 12b7334ca7981742dfb6166e7642d5df62fdaee7 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 23 Jan 2020 16:59:37 +0100 Subject: [PATCH 01/27] added gating tests --- .../Sanity-test-for-librabbitmq/Makefile | 63 +++++++++++++++++++ .../Sanity-test-for-librabbitmq/PURPOSE | 3 + .../Sanity-test-for-librabbitmq/runtest.sh | 58 +++++++++++++++++ tests/tests.yml | 11 ++++ 4 files changed, 135 insertions(+) create mode 100644 tests/Sanity/Sanity-test-for-librabbitmq/Makefile create mode 100644 tests/Sanity/Sanity-test-for-librabbitmq/PURPOSE create mode 100755 tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh create mode 100644 tests/tests.yml diff --git a/tests/Sanity/Sanity-test-for-librabbitmq/Makefile b/tests/Sanity/Sanity-test-for-librabbitmq/Makefile new file mode 100644 index 0000000..d50938a --- /dev/null +++ b/tests/Sanity/Sanity-test-for-librabbitmq/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/librabbitmq/Sanity/Sanity-test-for-librabbitmq +# Description: Tests the sanity of librabbitmq +# Author: Than Ngo +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2019 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/CoreOS/librabbitmq/Sanity/Sanity-test-for-librabbitmq +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Than Ngo " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: tests basic functionality" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 5m" >> $(METADATA) + @echo "RunFor: librabbitmq" >> $(METADATA) + @echo "Requires: librabbitmq librabbitmq-devel" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: MIT" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/Sanity/Sanity-test-for-librabbitmq/PURPOSE b/tests/Sanity/Sanity-test-for-librabbitmq/PURPOSE new file mode 100644 index 0000000..d4111a3 --- /dev/null +++ b/tests/Sanity/Sanity-test-for-librabbitmq/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /CoreOS/librabbitmq/Sanity/Sanity-test-for-librabbitmq +Description: Tests the sanity +Author: Than Ngo diff --git a/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh b/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh new file mode 100755 index 0000000..76ed9f6 --- /dev/null +++ b/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh @@ -0,0 +1,58 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/librabbitmq/Sanity/Sanity-test-for-librabbitmq +# Description: Tests the sanity +# Author: Than Ngo , Brock Organ +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2019 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +PACKAGES="librabbitmq librabbitmq-devel" + +# source the test script helpers +. /usr/bin/rhts-environment.sh || exit 1 +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + for p in $PACKAGES ; do + rlAssertRpm $p + done + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest "Smoke, sanity and function tests" + for o in $(ls -1 /usr/lib64/librabbitmq.so*) ; do + rlRun "ldd $o" 0 "validate the shared objects" + rlRun "objdump -T $o" 0 "validate the shared objects" + done + rlRun "head /usr/share/doc/librabbitmq-devel/README.md" 0 "correct form for doc file" + rlRun "head /usr/share/licenses/librabbitmq/LICENSE-MIT" 0 "correct form for doc file" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -fr $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..96c2b94 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,11 @@ +--- +# Run tests in all contexts +- hosts: localhost + tags: + - classic + roles: + - role: standard-test-beakerlib + tests: + - Sanity + required_packages: + - librabbitmq From bb23ad265aeb5ab9e7068ff906e608ebc61eaf5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 10:10:04 +0000 Subject: [PATCH 02/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 4a65e10..5652b01 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -17,7 +17,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -114,6 +114,9 @@ make test %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 2 2019 Remi Collet - 0.10.0-1 - update to 0.10.0 From e973284f4bcd47ac1fe80904e3e1164e0a8e4111 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 05:25:20 +0000 Subject: [PATCH 03/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 5652b01..44bf4bc 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -17,7 +17,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.10.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -114,6 +114,9 @@ make test %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From bee45238582c3fb58dd64dcbb81a7ab091c96437 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:07:30 +0000 Subject: [PATCH 04/27] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 44bf4bc..b5dc2b2 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -17,7 +17,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.10.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -114,6 +114,10 @@ make test %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.10.0-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8962071855c4c66dd45abc31f73ac6862ecf1dda Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Aug 2020 08:44:55 +0200 Subject: [PATCH 05/27] fix cmake macros usage, FTBFS #1863670 --- librabbitmq.spec | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index b5dc2b2..765f6ba 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -1,6 +1,6 @@ # Fedora spec file for librabbitmq # -# Copyright (c) 2012-2019 Remi Collet +# Copyright (c) 2012-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -17,7 +17,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.10.0 -Release: 4%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -76,13 +76,21 @@ sed -e '/test_basic/d' -i tests/CMakeLists.txt %cmake \ -DBUILD_TOOLS_DOCS:BOOL=ON \ -DBUILD_STATIC_LIBS:BOOL=ON \ - . + -S . +%if 0%{?cmake_build:1} +%cmake_build +%else make %{_smp_mflags} +%endif %install +%if 0%{?cmake_install:1} +%cmake_install +%else make install DESTDIR="%{buildroot}" +%endif rm %{buildroot}%{_libdir}/%{libname}.a @@ -92,7 +100,11 @@ rm %{buildroot}%{_libdir}/%{libname}.a grep @ %{buildroot}%{_libdir}/pkgconfig/librabbitmq.pc && exit 1 : upstream tests +%if 0%{?ctest:1} +%ctest +%else make test +%endif %files @@ -114,12 +126,8 @@ make test %changelog -* Sat Aug 01 2020 Fedora Release Engineering - 0.10.0-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Thu Aug 13 2020 Remi Collet - 0.10.0-3 +- fix cmake macros usage, FTBFS #1863670 * Wed Jan 29 2020 Fedora Release Engineering - 0.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a6d35ac2438a9e6a994e7f6a147657b59e8efa80 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 02:34:43 +0000 Subject: [PATCH 06/27] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- librabbitmq.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/librabbitmq.spec b/librabbitmq.spec index 765f6ba..d9905f3 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -30,6 +30,7 @@ BuildRequires: openssl-devel BuildRequires: popt-devel > 1.14 # For man page BuildRequires: xmlto +BuildRequires: make %description From b6e910fef34e2cebbe89786d96fef3227e5fee99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:50:11 +0000 Subject: [PATCH 07/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index d9905f3..6831261 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -17,7 +17,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.10.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -127,6 +127,9 @@ make test %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Aug 13 2020 Remi Collet - 0.10.0-3 - fix cmake macros usage, FTBFS #1863670 From f94a78763b2c10c3735157a2877666989fecf115 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Apr 2021 11:52:33 +0200 Subject: [PATCH 08/27] update to 0.11.0 add patch to not install the static library, from https://github.com/alanxz/rabbitmq-c/pull/665 --- .gitignore | 1 + librabbitmq.spec | 35 ++++++++++++++++++++++++++++------- rabbitmq-c-static.patch | 41 +++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 rabbitmq-c-static.patch diff --git a/.gitignore b/.gitignore index 95105f6..2f03bfb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /rabbitmq-c-0.8.0-caad0ef.tar.gz /rabbitmq-c-0.9.0-77e3805.tar.gz /rabbitmq-c-0.10.0-ffe918a.tar.gz +/rabbitmq-c-0.11.0-a64c08c.tar.gz diff --git a/librabbitmq.spec b/librabbitmq.spec index 6831261..eb5be0f 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -1,13 +1,15 @@ # Fedora spec file for librabbitmq # -# Copyright (c) 2012-2020 Remi Collet +# Copyright (c) 2012-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit ffe918a5fcef72038a88054dca3c56762b1953d4 +%bcond_without tests + +%global gh_commit a64c08c68aff34d49a2ac152f04988cd921084f9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner alanxz %global gh_project rabbitmq-c @@ -16,13 +18,16 @@ Name: %{libname} Summary: Client library for AMQP -Version: 0.10.0 -Release: 4%{?dist} +Version: 0.11.0 +Release: 1%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +# don't install static library +Patch0: %{gh_project}-static.patch + BuildRequires: gcc BuildRequires: cmake > 2.8 BuildRequires: openssl-devel @@ -64,6 +69,7 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -76,7 +82,12 @@ sed -e '/test_basic/d' -i tests/CMakeLists.txt # static lib required for tests %cmake \ -DBUILD_TOOLS_DOCS:BOOL=ON \ - -DBUILD_STATIC_LIBS:BOOL=ON \ +%if %{with tests} + -DINSTALL_STATIC_LIBS:BOOL=OFF \ +%else + -DBUILD_TESTS:BOOL=OFF \ + -DBUILD_STATIC_LIBS:BOOL=OFF \ +%endif -S . %if 0%{?cmake_build:1} @@ -93,19 +104,23 @@ make %{_smp_mflags} make install DESTDIR="%{buildroot}" %endif -rm %{buildroot}%{_libdir}/%{libname}.a - %check : check .pc is usable grep @ %{buildroot}%{_libdir}/pkgconfig/librabbitmq.pc && exit 1 +: check cmake files are usable +grep static %{buildroot}%{_libdir}/cmake/rabbitmq-c/*.cmake && exit 1 +%if %{with tests} : upstream tests %if 0%{?ctest:1} %ctest %else make test %endif +%else +: Tests disabled +%endif %files @@ -119,6 +134,7 @@ make test %{_libdir}/%{libname}.so %{_includedir}/amqp* %{_libdir}/pkgconfig/%{libname}.pc +%{_libdir}/cmake/rabbitmq-c %files tools %{_bindir}/amqp-* @@ -127,6 +143,11 @@ make test %changelog +* Thu Apr 1 2021 Remi Collet - 0.11.0-1 +- update to 0.11.0 +- add patch to not install the static library, from + https://github.com/alanxz/rabbitmq-c/pull/665 + * Tue Jan 26 2021 Fedora Release Engineering - 0.10.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/rabbitmq-c-static.patch b/rabbitmq-c-static.patch new file mode 100644 index 0000000..0315347 --- /dev/null +++ b/rabbitmq-c-static.patch @@ -0,0 +1,41 @@ +From a8c05cb16afbf852fc584f2c2d31d2f7f0e3a48d Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 1 Apr 2021 11:21:36 +0200 +Subject: [PATCH] add option to install or not the static library + +--- + CMakeLists.txt | 1 + + librabbitmq/CMakeLists.txt | 8 +++++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a9a29fdd..a7cf8f2c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -245,6 +245,7 @@ endif() + + option(BUILD_SHARED_LIBS "Build rabbitmq-c as a shared library" ON) + option(BUILD_STATIC_LIBS "Build rabbitmq-c as a static library" ON) ++option(INSTALL_STATIC_LIBS "Install rabbitmq-c static library" ON) + + option(BUILD_EXAMPLES "Build Examples" ON) + option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND}) +diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt +index d8dcd262..72b4a875 100644 +--- a/librabbitmq/CMakeLists.txt ++++ b/librabbitmq/CMakeLists.txt +@@ -154,9 +154,11 @@ if (BUILD_STATIC_LIBS) + set_target_properties(rabbitmq-static PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION} OUTPUT_NAME rabbitmq) + endif (WIN32) + +- install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ) ++ if (INSTALL_STATIC_LIBS) ++ install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ) ++ endif (INSTALL_STATIC_LIBS) + + if (NOT DEFINED RMQ_LIBRARY_TARGET) + set(RMQ_LIBRARY_TARGET rabbitmq-static) diff --git a/sources b/sources index 1f552b6..d54ea82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-c-0.10.0-ffe918a.tar.gz) = 05756176feffc3ccff9bf4f8416191c382c9e5b51d7dd72664cea0407c847d50cb4048b8669415d879396c0c7e8c1c38c65a66a98701e55de09afed893abc5a0 +SHA512 (rabbitmq-c-0.11.0-a64c08c.tar.gz) = 0e0c77c3ce2de49841b4d2a8745bfdb118fc3bdf924c1f60d8ca168d7a933276f5d86e1d1440c2936859e6a6bddeb77eaa3c59f5f20e998160dde7d57cea4282 From 46f4f862d3975f9422081164da1fd649999c76dd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Apr 2021 14:54:20 +0200 Subject: [PATCH 09/27] add patch to fix version in cmake file from https://github.com/alanxz/rabbitmq-c/pull/667 --- librabbitmq.spec | 9 ++++++++- rabbitmq-c-version.patch | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 rabbitmq-c-version.patch diff --git a/librabbitmq.spec b/librabbitmq.spec index eb5be0f..b2a8648 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.11.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -27,6 +27,8 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{g # don't install static library Patch0: %{gh_project}-static.patch +# fix version for cmake module +Patch1: %{gh_project}-version.patch BuildRequires: gcc BuildRequires: cmake > 2.8 @@ -70,6 +72,7 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 +%patch1 -p1 # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -143,6 +146,10 @@ make test %changelog +* Thu Apr 1 2021 Remi Collet - 0.11.0-2 +- add patch to fix version in cmake file from + https://github.com/alanxz/rabbitmq-c/pull/667 + * Thu Apr 1 2021 Remi Collet - 0.11.0-1 - update to 0.11.0 - add patch to not install the static library, from diff --git a/rabbitmq-c-version.patch b/rabbitmq-c-version.patch new file mode 100644 index 0000000..9826170 --- /dev/null +++ b/rabbitmq-c-version.patch @@ -0,0 +1,25 @@ +From 2a9ae303f7fa7bc115ecb827c1c3c7c9f84558dd Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 1 Apr 2021 14:48:25 +0200 +Subject: [PATCH] Fix #666 bad PACKAGE_VERSION + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a9a29fd..74364cf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -322,7 +322,7 @@ set(version_config "${CMAKE_CURRENT_BINARY_DIR}/rabbitmq-c-config-version.cmake" + + write_basic_package_version_file( + "${version_config}" +- VERSION ${RMQ_VERSION} ++ VERSION ${VERSION} + COMPATIBILITY AnyNewerVersion) + + configure_package_config_file( +-- +2.30.2 + From 867ec8326802472f728571cbb6c749dec4655921 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 12:11:25 +0000 Subject: [PATCH 10/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index b2a8648..e3e1001 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.11.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -146,6 +146,9 @@ make test %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Apr 1 2021 Remi Collet - 0.11.0-2 - add patch to fix version in cmake file from https://github.com/alanxz/rabbitmq-c/pull/667 From 04e1956c2fe8333c2db83a011a18777a26f197c0 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:06:30 +0200 Subject: [PATCH 11/27] Rebuilt with OpenSSL 3.0.0 --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index e3e1001..3c965c0 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.11.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -146,6 +146,9 @@ make test %changelog +* Tue Sep 14 2021 Sahana Prasad - 0.11.0-4 +- Rebuilt with OpenSSL 3.0.0 + * Thu Jul 22 2021 Fedora Release Engineering - 0.11.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From ddc614c5a2dad39da31a0899efbf555209995c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:03:51 +0000 Subject: [PATCH 12/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 3c965c0..c6322df 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.11.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -146,6 +146,9 @@ make test %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 0.11.0-4 - Rebuilt with OpenSSL 3.0.0 From d1a316b4bc2f0004eb7827ef1a2b18b6f27da858 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 18:46:45 +0000 Subject: [PATCH 13/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index c6322df..692715f 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.11.0 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -146,6 +146,9 @@ make test %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.11.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.11.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 4a19c1cd278ea47a54abd3606da3c6dfb801b06d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 17:15:12 +0000 Subject: [PATCH 14/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 692715f..eb11ae9 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.11.0 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -146,6 +146,9 @@ make test %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.11.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.11.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6d8fc3cdc8c7f01ca338ced3b1075aa502cae97d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Feb 2023 07:55:38 +0100 Subject: [PATCH 15/27] update to 0.12.0 add patch to not install the static library, from https://github.com/alanxz/rabbitmq-c/pull/749 add patch to fix version in pkgconfig file, from https://github.com/alanxz/rabbitmq-c/pull/751 --- .gitignore | 1 + librabbitmq.spec | 36 ++++++++++++++++++--------- rabbitmq-c-pkg.patch | 22 ++++++++++++++++ rabbitmq-c-static.patch | 54 ++++++++++++++++++++++++---------------- rabbitmq-c-version.patch | 25 ------------------- sources | 2 +- 6 files changed, 80 insertions(+), 60 deletions(-) create mode 100644 rabbitmq-c-pkg.patch delete mode 100644 rabbitmq-c-version.patch diff --git a/.gitignore b/.gitignore index 2f03bfb..d90f329 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /rabbitmq-c-0.9.0-77e3805.tar.gz /rabbitmq-c-0.10.0-ffe918a.tar.gz /rabbitmq-c-0.11.0-a64c08c.tar.gz +/rabbitmq-c-0.12.0-675afc2.tar.gz diff --git a/librabbitmq.spec b/librabbitmq.spec index eb11ae9..70981b2 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -1,7 +1,7 @@ # Fedora spec file for librabbitmq # -# Copyright (c) 2012-2021 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2012-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit a64c08c68aff34d49a2ac152f04988cd921084f9 +%global gh_commit 675afc2c7c2f556c7fb7c1db7d3b05ce82adfb70 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner alanxz %global gh_project rabbitmq-c @@ -18,8 +18,8 @@ Name: %{libname} Summary: Client library for AMQP -Version: 0.11.0 -Release: 7%{?dist} +Version: 0.12.0 +Release: 1%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -27,12 +27,12 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{g # don't install static library Patch0: %{gh_project}-static.patch -# fix version for cmake module -Patch1: %{gh_project}-version.patch +# fix version in pkgconfig file +Patch1: %{gh_project}-pkg.patch BuildRequires: gcc -BuildRequires: cmake > 2.8 -BuildRequires: openssl-devel +BuildRequires: cmake > 3.12 +BuildRequires: openssl-devel >= 1.1.1 # For tools BuildRequires: popt-devel > 1.14 # For man page @@ -84,11 +84,12 @@ sed -e '/test_basic/d' -i tests/CMakeLists.txt %build # static lib required for tests %cmake \ + -DBUILD_TOOLS:BOOL=ON \ -DBUILD_TOOLS_DOCS:BOOL=ON \ %if %{with tests} -DINSTALL_STATIC_LIBS:BOOL=OFF \ %else - -DBUILD_TESTS:BOOL=OFF \ + -DBUILD_TESTING:BOOL=OFF \ -DBUILD_STATIC_LIBS:BOOL=OFF \ %endif -S . @@ -111,9 +112,11 @@ make install DESTDIR="%{buildroot}" %check : check .pc is usable grep @ %{buildroot}%{_libdir}/pkgconfig/librabbitmq.pc && exit 1 +grep %{version} %{buildroot}%{_libdir}/pkgconfig/librabbitmq.pc || exit 1 : check cmake files are usable grep static %{buildroot}%{_libdir}/cmake/rabbitmq-c/*.cmake && exit 1 + %if %{with tests} : upstream tests %if 0%{?ctest:1} @@ -127,8 +130,9 @@ make test %files -%license LICENSE-MIT -%{_libdir}/%{libname}.so.%{soname}* +%license LICENSE +%{_libdir}/%{libname}.so.%{soname} +%{_libdir}/%{libname}.so.%{version} %files devel @@ -136,6 +140,7 @@ make test %doc Examples %{_libdir}/%{libname}.so %{_includedir}/amqp* +%{_includedir}/rabbitmq-c %{_libdir}/pkgconfig/%{libname}.pc %{_libdir}/cmake/rabbitmq-c @@ -146,6 +151,13 @@ make test %changelog +* Wed Feb 1 2023 Remi Collet - 0.12.0-1 +- update to 0.12.0 +- add patch to not install the static library, from + https://github.com/alanxz/rabbitmq-c/pull/749 +- add patch to fix version in pkgconfig file, from + https://github.com/alanxz/rabbitmq-c/pull/751 + * Thu Jan 19 2023 Fedora Release Engineering - 0.11.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/rabbitmq-c-pkg.patch b/rabbitmq-c-pkg.patch new file mode 100644 index 0000000..e6da509 --- /dev/null +++ b/rabbitmq-c-pkg.patch @@ -0,0 +1,22 @@ +From f97f91c5d1db9ae97f3e1ac743ef63c1ccde4edc Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 2 Feb 2023 07:38:06 +0100 +Subject: [PATCH] fix empty version for pkjgconfig + +--- + librabbitmq.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/librabbitmq.pc.in b/librabbitmq.pc.in +index 39401807..711d01d2 100644 +--- a/librabbitmq.pc.in ++++ b/librabbitmq.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: rabbitmq-c + Description: An AMQP 0-9-1 client library +-Version: @VERSION@ ++Version: @RMQ_VERSION@ + URL: https://github.com/alanxz/rabbitmq-c + Requires.private: @requires_private@ + Libs: -L${libdir} -lrabbitmq diff --git a/rabbitmq-c-static.patch b/rabbitmq-c-static.patch index 0315347..fd006df 100644 --- a/rabbitmq-c-static.patch +++ b/rabbitmq-c-static.patch @@ -1,41 +1,51 @@ -From a8c05cb16afbf852fc584f2c2d31d2f7f0e3a48d Mon Sep 17 00:00:00 2001 +From e1a9b7148e7ae7c55b59249e506d644af38492ed Mon Sep 17 00:00:00 2001 From: Remi Collet -Date: Thu, 1 Apr 2021 11:21:36 +0200 +Date: Wed, 1 Feb 2023 16:39:57 +0100 Subject: [PATCH] add option to install or not the static library --- - CMakeLists.txt | 1 + + CMakeLists.txt | 3 ++- librabbitmq/CMakeLists.txt | 8 +++++--- - 2 files changed, 6 insertions(+), 3 deletions(-) + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a9a29fdd..a7cf8f2c 100644 +index cc61e88f..7b7590f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -245,6 +245,7 @@ endif() +@@ -129,6 +129,7 @@ include(CMakeDependentOption) option(BUILD_SHARED_LIBS "Build rabbitmq-c as a shared library" ON) option(BUILD_STATIC_LIBS "Build rabbitmq-c as a static library" ON) +option(INSTALL_STATIC_LIBS "Install rabbitmq-c static library" ON) - option(BUILD_EXAMPLES "Build Examples" ON) - option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND}) + option(BUILD_EXAMPLES "Build Examples" OFF) + option(BUILD_TOOLS "Build Tools (requires POPT Library)" OFF) +@@ -244,7 +245,7 @@ configure_package_config_file( + if(BUILD_SHARED_LIBS) + list(APPEND INSTALL_TARGETS rabbitmq) + endif() +-if(BUILD_STATIC_LIBS) ++if(BUILD_STATIC_LIBS AND INSTALL_STATIC_LIBS) + list(APPEND INSTALL_TARGETS rabbitmq-static) + endif() + diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt -index d8dcd262..72b4a875 100644 +index 1cc58d58..347c992f 100644 --- a/librabbitmq/CMakeLists.txt +++ b/librabbitmq/CMakeLists.txt -@@ -154,9 +154,11 @@ if (BUILD_STATIC_LIBS) - set_target_properties(rabbitmq-static PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION} OUTPUT_NAME rabbitmq) - endif (WIN32) +@@ -142,10 +142,12 @@ if(BUILD_STATIC_LIBS) + set_target_properties(rabbitmq-static PROPERTIES COMPILE_OPTIONS "/Z7") + endif() -- install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ) -+ if (INSTALL_STATIC_LIBS) -+ install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ) -+ endif (INSTALL_STATIC_LIBS) +- install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ if(INSTALL_STATIC_LIBS) ++ install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT rabbitmq-c-development +- ) ++ ) ++ endif() - if (NOT DEFINED RMQ_LIBRARY_TARGET) - set(RMQ_LIBRARY_TARGET rabbitmq-static) + add_library(rabbitmq::rabbitmq-static ALIAS rabbitmq-static) + endif() diff --git a/rabbitmq-c-version.patch b/rabbitmq-c-version.patch deleted file mode 100644 index 9826170..0000000 --- a/rabbitmq-c-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2a9ae303f7fa7bc115ecb827c1c3c7c9f84558dd Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 1 Apr 2021 14:48:25 +0200 -Subject: [PATCH] Fix #666 bad PACKAGE_VERSION - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a9a29fd..74364cf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -322,7 +322,7 @@ set(version_config "${CMAKE_CURRENT_BINARY_DIR}/rabbitmq-c-config-version.cmake" - - write_basic_package_version_file( - "${version_config}" -- VERSION ${RMQ_VERSION} -+ VERSION ${VERSION} - COMPATIBILITY AnyNewerVersion) - - configure_package_config_file( --- -2.30.2 - diff --git a/sources b/sources index d54ea82..2b22d2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-c-0.11.0-a64c08c.tar.gz) = 0e0c77c3ce2de49841b4d2a8745bfdb118fc3bdf924c1f60d8ca168d7a933276f5d86e1d1440c2936859e6a6bddeb77eaa3c59f5f20e998160dde7d57cea4282 +SHA512 (rabbitmq-c-0.12.0-675afc2.tar.gz) = 522a7d52a156fe7510d37087582177cc50648559ab0d7626abf8d3ca1f94913a28438dc8334d50c2652d6d571baf23562b9ff73ddbaa221913ad2fd4b6b7ca25 From 4a44388b3f24ac8e2dd4509a9db361846d92ce72 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Feb 2023 08:39:23 +0100 Subject: [PATCH 16/27] update to 0.13.0 drop patches merged upstream --- .gitignore | 1 + librabbitmq.spec | 17 ++++++-------- rabbitmq-c-pkg.patch | 22 ------------------ rabbitmq-c-static.patch | 51 ----------------------------------------- sources | 2 +- 5 files changed, 9 insertions(+), 84 deletions(-) delete mode 100644 rabbitmq-c-pkg.patch delete mode 100644 rabbitmq-c-static.patch diff --git a/.gitignore b/.gitignore index d90f329..28e43af 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /rabbitmq-c-0.10.0-ffe918a.tar.gz /rabbitmq-c-0.11.0-a64c08c.tar.gz /rabbitmq-c-0.12.0-675afc2.tar.gz +/rabbitmq-c-0.13.0-974d71a.tar.gz diff --git a/librabbitmq.spec b/librabbitmq.spec index 70981b2..c7d59a7 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 675afc2c7c2f556c7fb7c1db7d3b05ce82adfb70 +%global gh_commit 974d71adceae6d742ae20a4c880d99c131f1460a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner alanxz %global gh_project rabbitmq-c @@ -18,18 +18,13 @@ Name: %{libname} Summary: Client library for AMQP -Version: 0.12.0 +Version: 0.13.0 Release: 1%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -# don't install static library -Patch0: %{gh_project}-static.patch -# fix version in pkgconfig file -Patch1: %{gh_project}-pkg.patch - BuildRequires: gcc BuildRequires: cmake > 3.12 BuildRequires: openssl-devel >= 1.1.1 @@ -71,8 +66,6 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -%patch1 -p1 # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -136,7 +129,7 @@ make test %files devel -%doc AUTHORS THANKS TODO *.md +%doc AUTHORS THANKS *.md %doc Examples %{_libdir}/%{libname}.so %{_includedir}/amqp* @@ -151,6 +144,10 @@ make test %changelog +* Mon Feb 6 2023 Remi Collet - 0.13.0-1 +- update to 0.13.0 +- drop patches merged upstream + * Wed Feb 1 2023 Remi Collet - 0.12.0-1 - update to 0.12.0 - add patch to not install the static library, from diff --git a/rabbitmq-c-pkg.patch b/rabbitmq-c-pkg.patch deleted file mode 100644 index e6da509..0000000 --- a/rabbitmq-c-pkg.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f97f91c5d1db9ae97f3e1ac743ef63c1ccde4edc Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 2 Feb 2023 07:38:06 +0100 -Subject: [PATCH] fix empty version for pkjgconfig - ---- - librabbitmq.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librabbitmq.pc.in b/librabbitmq.pc.in -index 39401807..711d01d2 100644 ---- a/librabbitmq.pc.in -+++ b/librabbitmq.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: rabbitmq-c - Description: An AMQP 0-9-1 client library --Version: @VERSION@ -+Version: @RMQ_VERSION@ - URL: https://github.com/alanxz/rabbitmq-c - Requires.private: @requires_private@ - Libs: -L${libdir} -lrabbitmq diff --git a/rabbitmq-c-static.patch b/rabbitmq-c-static.patch deleted file mode 100644 index fd006df..0000000 --- a/rabbitmq-c-static.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e1a9b7148e7ae7c55b59249e506d644af38492ed Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 1 Feb 2023 16:39:57 +0100 -Subject: [PATCH] add option to install or not the static library - ---- - CMakeLists.txt | 3 ++- - librabbitmq/CMakeLists.txt | 8 +++++--- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cc61e88f..7b7590f1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -129,6 +129,7 @@ include(CMakeDependentOption) - - option(BUILD_SHARED_LIBS "Build rabbitmq-c as a shared library" ON) - option(BUILD_STATIC_LIBS "Build rabbitmq-c as a static library" ON) -+option(INSTALL_STATIC_LIBS "Install rabbitmq-c static library" ON) - - option(BUILD_EXAMPLES "Build Examples" OFF) - option(BUILD_TOOLS "Build Tools (requires POPT Library)" OFF) -@@ -244,7 +245,7 @@ configure_package_config_file( - if(BUILD_SHARED_LIBS) - list(APPEND INSTALL_TARGETS rabbitmq) - endif() --if(BUILD_STATIC_LIBS) -+if(BUILD_STATIC_LIBS AND INSTALL_STATIC_LIBS) - list(APPEND INSTALL_TARGETS rabbitmq-static) - endif() - -diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt -index 1cc58d58..347c992f 100644 ---- a/librabbitmq/CMakeLists.txt -+++ b/librabbitmq/CMakeLists.txt -@@ -142,10 +142,12 @@ if(BUILD_STATIC_LIBS) - set_target_properties(rabbitmq-static PROPERTIES COMPILE_OPTIONS "/Z7") - endif() - -- install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ if(INSTALL_STATIC_LIBS) -+ install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT rabbitmq-c-development -- ) -+ ) -+ endif() - - add_library(rabbitmq::rabbitmq-static ALIAS rabbitmq-static) - endif() diff --git a/sources b/sources index 2b22d2d..d9fada3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-c-0.12.0-675afc2.tar.gz) = 522a7d52a156fe7510d37087582177cc50648559ab0d7626abf8d3ca1f94913a28438dc8334d50c2652d6d571baf23562b9ff73ddbaa221913ad2fd4b6b7ca25 +SHA512 (rabbitmq-c-0.13.0-974d71a.tar.gz) = 58b3ca777a971ac451edb75afb2446d4bf7611134387db6dadcc95ff1f44257eb1812ff665f658544e03e14622ccc6aacc26d03d1b30a16470ccb1977275bf34 From f2118470193f3e4ab6003228c6f1c669ed236b89 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 29 Jun 2023 10:29:18 +0200 Subject: [PATCH 17/27] fix security issue, CVE-2023-35789 --- librabbitmq.spec | 9 ++- rabbitmq-c-CVE-2023-35789.patch | 125 ++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 rabbitmq-c-CVE-2023-35789.patch diff --git a/librabbitmq.spec b/librabbitmq.spec index c7d59a7..8aee855 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,12 +19,15 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.13.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +# CVE-2023-35789, https://github.com/alanxz/rabbitmq-c/pull/781 +Patch0: rabbitmq-c-CVE-2023-35789.patch + BuildRequires: gcc BuildRequires: cmake > 3.12 BuildRequires: openssl-devel >= 1.1.1 @@ -66,6 +69,7 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch -P0 -p1 # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -144,6 +148,9 @@ make test %changelog +* Thu Jun 29 2023 Than Ngo - 0.13.0-2 +- fix security issue, CVE-2023-35789 + * Mon Feb 6 2023 Remi Collet - 0.13.0-1 - update to 0.13.0 - drop patches merged upstream diff --git a/rabbitmq-c-CVE-2023-35789.patch b/rabbitmq-c-CVE-2023-35789.patch new file mode 100644 index 0000000..71f8ba9 --- /dev/null +++ b/rabbitmq-c-CVE-2023-35789.patch @@ -0,0 +1,125 @@ +commit 463054383fbeef889b409a7f843df5365288e2a0 +Author: Christian Kastner +Date: Tue Jun 13 14:21:52 2023 +0200 + + Add option to read username/password from file (#781) + + * Add option to read username/password from file + +diff --git a/tools/common.c b/tools/common.c +index 73b47e2..7efe557 100644 +--- a/tools/common.c ++++ b/tools/common.c +@@ -18,6 +18,11 @@ + #include "compat.h" + #endif + ++/* For when reading auth data from a file */ ++#define MAXAUTHTOKENLEN 128 ++#define USERNAMEPREFIX "username:" ++#define PASSWORDPREFIX "password:" ++ + void die(const char *fmt, ...) { + va_list ap; + va_start(ap, fmt); +@@ -125,6 +130,7 @@ static char *amqp_vhost; + static char *amqp_username; + static char *amqp_password; + static int amqp_heartbeat = 0; ++static char *amqp_authfile; + #ifdef WITH_SSL + static int amqp_ssl = 0; + static char *amqp_cacert = "/etc/ssl/certs/cacert.pem"; +@@ -147,6 +153,8 @@ struct poptOption connect_options[] = { + "the password to login with", "password"}, + {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0, + "heartbeat interval, set to 0 to disable", "heartbeat"}, ++ {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0, ++ "path to file containing username/password for authentication", "file"}, + #ifdef WITH_SSL + {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL}, + {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0, +@@ -158,6 +166,50 @@ struct poptOption connect_options[] = { + #endif /* WITH_SSL */ + {NULL, '\0', 0, NULL, 0, NULL, NULL}}; + ++void read_authfile(const char *path) { ++ size_t n; ++ FILE *fp = NULL; ++ char token[MAXAUTHTOKENLEN]; ++ ++ if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL || ++ (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) { ++ die("Out of memory"); ++ } else if ((fp = fopen(path, "r")) == NULL) { ++ die("Could not read auth data file %s", path); ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) { ++ die("Malformed auth file (missing username)"); ++ } ++ strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_username); ++ if (amqp_username[n - 1] != '\n') { ++ die("Username too long"); ++ } else { ++ amqp_username[n - 1] = '\0'; ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) { ++ die("Malformed auth file (missing password)"); ++ } ++ strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_password); ++ if (amqp_password[n - 1] != '\n') { ++ die("Password too long"); ++ } else { ++ amqp_password[n - 1] = '\0'; ++ } ++ ++ (void)fgetc(fp); ++ if (!feof(fp)) { ++ die("Malformed auth file (trailing data)"); ++ } ++} ++ + static void init_connection_info(struct amqp_connection_info *ci) { + ci->user = NULL; + ci->password = NULL; +@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_username) { + if (amqp_url) { + die("--username and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--username and --authfile options cannot be used at the same time"); + } + + ci->user = amqp_username; +@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_password) { + if (amqp_url) { + die("--password and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--password and --authfile options cannot be used at the same time"); + } + + ci->password = amqp_password; + } + ++ if (amqp_authfile) { ++ if (amqp_url) { ++ die("--authfile and --url options cannot be used at the same time"); ++ } ++ ++ read_authfile(amqp_authfile); ++ ci->user = amqp_username; ++ ci->password = amqp_password; ++ } ++ + if (amqp_vhost) { + if (amqp_url) { + die("--vhost and --url options cannot be used at the same time"); From b6ba207992b95794954b6ee0d3fd94df577ba815 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 11:52:42 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 8aee855..138d52c 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.13.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -148,6 +148,9 @@ make test %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 29 2023 Than Ngo - 0.13.0-2 - fix security issue, CVE-2023-35789 From 4e251d7513d28f5633d69721eb617d4226b43cbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:08:18 +0000 Subject: [PATCH 19/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 138d52c..fc207e3 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.13.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -148,6 +148,9 @@ make test %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.13.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e213f277603c0b9ad7305f7fa8b545e2bbf75351 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 03:19:18 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index fc207e3..b7c1bf2 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.13.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -148,6 +148,9 @@ make test %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.13.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From bfc2a55eaf79057bf2487cd3f258250312913e1a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Mar 2024 08:24:06 +0100 Subject: [PATCH 21/27] update to 0.14.0 drop upstream patch --- .gitignore | 1 + librabbitmq.spec | 19 ++--- rabbitmq-c-CVE-2023-35789.patch | 125 -------------------------------- sources | 2 +- 4 files changed, 12 insertions(+), 135 deletions(-) delete mode 100644 rabbitmq-c-CVE-2023-35789.patch diff --git a/.gitignore b/.gitignore index 28e43af..c67a568 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /rabbitmq-c-0.11.0-a64c08c.tar.gz /rabbitmq-c-0.12.0-675afc2.tar.gz /rabbitmq-c-0.13.0-974d71a.tar.gz +/rabbitmq-c-0.14.0-124722b.tar.gz diff --git a/librabbitmq.spec b/librabbitmq.spec index b7c1bf2..292b127 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -1,6 +1,6 @@ # Fedora spec file for librabbitmq # -# Copyright (c) 2012-2023 Remi Collet +# Copyright (c) 2012-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 974d71adceae6d742ae20a4c880d99c131f1460a +%global gh_commit 124722b5045baa41a24ce2e2d7c52a47467e7ac0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner alanxz %global gh_project rabbitmq-c @@ -18,21 +18,19 @@ Name: %{libname} Summary: Client library for AMQP -Version: 0.13.0 -Release: 5%{?dist} +Version: 0.14.0 +Release: 1%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -# CVE-2023-35789, https://github.com/alanxz/rabbitmq-c/pull/781 -Patch0: rabbitmq-c-CVE-2023-35789.patch BuildRequires: gcc -BuildRequires: cmake > 3.12 +BuildRequires: cmake >= 3.22 BuildRequires: openssl-devel >= 1.1.1 # For tools -BuildRequires: popt-devel > 1.14 +BuildRequires: popt-devel >= 1.14 # For man page BuildRequires: xmlto BuildRequires: make @@ -69,7 +67,6 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p1 # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -148,6 +145,10 @@ make test %changelog +* Tue Mar 26 2024 Remi Collet - 0.14.0-1 +- update to 0.14.0 +- drop upstream patch + * Thu Jan 25 2024 Fedora Release Engineering - 0.13.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/rabbitmq-c-CVE-2023-35789.patch b/rabbitmq-c-CVE-2023-35789.patch deleted file mode 100644 index 71f8ba9..0000000 --- a/rabbitmq-c-CVE-2023-35789.patch +++ /dev/null @@ -1,125 +0,0 @@ -commit 463054383fbeef889b409a7f843df5365288e2a0 -Author: Christian Kastner -Date: Tue Jun 13 14:21:52 2023 +0200 - - Add option to read username/password from file (#781) - - * Add option to read username/password from file - -diff --git a/tools/common.c b/tools/common.c -index 73b47e2..7efe557 100644 ---- a/tools/common.c -+++ b/tools/common.c -@@ -18,6 +18,11 @@ - #include "compat.h" - #endif - -+/* For when reading auth data from a file */ -+#define MAXAUTHTOKENLEN 128 -+#define USERNAMEPREFIX "username:" -+#define PASSWORDPREFIX "password:" -+ - void die(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); -@@ -125,6 +130,7 @@ static char *amqp_vhost; - static char *amqp_username; - static char *amqp_password; - static int amqp_heartbeat = 0; -+static char *amqp_authfile; - #ifdef WITH_SSL - static int amqp_ssl = 0; - static char *amqp_cacert = "/etc/ssl/certs/cacert.pem"; -@@ -147,6 +153,8 @@ struct poptOption connect_options[] = { - "the password to login with", "password"}, - {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0, - "heartbeat interval, set to 0 to disable", "heartbeat"}, -+ {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0, -+ "path to file containing username/password for authentication", "file"}, - #ifdef WITH_SSL - {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL}, - {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0, -@@ -158,6 +166,50 @@ struct poptOption connect_options[] = { - #endif /* WITH_SSL */ - {NULL, '\0', 0, NULL, 0, NULL, NULL}}; - -+void read_authfile(const char *path) { -+ size_t n; -+ FILE *fp = NULL; -+ char token[MAXAUTHTOKENLEN]; -+ -+ if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL || -+ (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) { -+ die("Out of memory"); -+ } else if ((fp = fopen(path, "r")) == NULL) { -+ die("Could not read auth data file %s", path); -+ } -+ -+ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || -+ strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) { -+ die("Malformed auth file (missing username)"); -+ } -+ strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN); -+ /* Missing newline means token was cut off */ -+ n = strlen(amqp_username); -+ if (amqp_username[n - 1] != '\n') { -+ die("Username too long"); -+ } else { -+ amqp_username[n - 1] = '\0'; -+ } -+ -+ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || -+ strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) { -+ die("Malformed auth file (missing password)"); -+ } -+ strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN); -+ /* Missing newline means token was cut off */ -+ n = strlen(amqp_password); -+ if (amqp_password[n - 1] != '\n') { -+ die("Password too long"); -+ } else { -+ amqp_password[n - 1] = '\0'; -+ } -+ -+ (void)fgetc(fp); -+ if (!feof(fp)) { -+ die("Malformed auth file (trailing data)"); -+ } -+} -+ - static void init_connection_info(struct amqp_connection_info *ci) { - ci->user = NULL; - ci->password = NULL; -@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) { - if (amqp_username) { - if (amqp_url) { - die("--username and --url options cannot be used at the same time"); -+ } else if (amqp_authfile) { -+ die("--username and --authfile options cannot be used at the same time"); - } - - ci->user = amqp_username; -@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) { - if (amqp_password) { - if (amqp_url) { - die("--password and --url options cannot be used at the same time"); -+ } else if (amqp_authfile) { -+ die("--password and --authfile options cannot be used at the same time"); - } - - ci->password = amqp_password; - } - -+ if (amqp_authfile) { -+ if (amqp_url) { -+ die("--authfile and --url options cannot be used at the same time"); -+ } -+ -+ read_authfile(amqp_authfile); -+ ci->user = amqp_username; -+ ci->password = amqp_password; -+ } -+ - if (amqp_vhost) { - if (amqp_url) { - die("--vhost and --url options cannot be used at the same time"); diff --git a/sources b/sources index d9fada3..a650cbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-c-0.13.0-974d71a.tar.gz) = 58b3ca777a971ac451edb75afb2446d4bf7611134387db6dadcc95ff1f44257eb1812ff665f658544e03e14622ccc6aacc26d03d1b30a16470ccb1977275bf34 +SHA512 (rabbitmq-c-0.14.0-124722b.tar.gz) = 167f340002d96769e19b5ea7e567d397f6702b0c212cbcf771f2e8ea16531221046747f9d70315869f696587a9e0922d922362efcc45bb1401420e9558b63acc From edbe09f0581989c1df5b779b3e316f9ce4f92576 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Mar 2024 09:04:05 +0100 Subject: [PATCH 22/27] fix rpminspect rpmdeps --- librabbitmq.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 292b127..5c59e53 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.14.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -52,7 +52,7 @@ for %{name}. %package tools Summary: Example tools built using the librabbitmq package -Requires: %{name}%{?_isa} = %{version} +Requires: %{name}%{?_isa} = %{version}-%{release} %description tools This package contains example tools built using %{name}. @@ -145,9 +145,10 @@ make test %changelog -* Tue Mar 26 2024 Remi Collet - 0.14.0-1 +* Tue Mar 26 2024 Remi Collet - 0.14.0-2 - update to 0.14.0 - drop upstream patch +- fix rpminspect rpmdeps * Thu Jan 25 2024 Fedora Release Engineering - 0.13.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 284d843436730794d66adb5dd1dd4cfdb0e6e990 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 14:52:52 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 5c59e53..a933a94 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.14.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -145,6 +145,9 @@ make test %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Mar 26 2024 Remi Collet - 0.14.0-2 - update to 0.14.0 - drop upstream patch From 98a3623b841e621cd9caf24d90a2e4ad080abd18 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Nov 2024 10:10:23 +0100 Subject: [PATCH 24/27] v0.15.0 --- .gitignore | 1 + librabbitmq.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c67a568..89f6d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /rabbitmq-c-0.12.0-675afc2.tar.gz /rabbitmq-c-0.13.0-974d71a.tar.gz /rabbitmq-c-0.14.0-124722b.tar.gz +/rabbitmq-c-0.15.0-84b81cd.tar.gz diff --git a/librabbitmq.spec b/librabbitmq.spec index a933a94..4e425b9 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 124722b5045baa41a24ce2e2d7c52a47467e7ac0 +%global gh_commit 84b81cd97a1b5515d3d4b304796680da24c666d8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner alanxz %global gh_project rabbitmq-c @@ -18,8 +18,8 @@ Name: %{libname} Summary: Client library for AMQP -Version: 0.14.0 -Release: 3%{?dist} +Version: 0.15.0 +Release: 1%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -145,6 +145,9 @@ make test %changelog +* Thu Nov 21 2024 Remi Collet - 0.15.0-1 +- update to 0.15.0 + * Thu Jul 18 2024 Fedora Release Engineering - 0.14.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index a650cbf..0b05ed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-c-0.14.0-124722b.tar.gz) = 167f340002d96769e19b5ea7e567d397f6702b0c212cbcf771f2e8ea16531221046747f9d70315869f696587a9e0922d922362efcc45bb1401420e9558b63acc +SHA512 (rabbitmq-c-0.15.0-84b81cd.tar.gz) = a3a1e4ac5f9126a905de7f15b0580a3562c626891aa634dd72e96264da1b87107f82ba6b865ba178d228e025c4a1df370c648d30a13d1422710b74b7ba38cbea From 98ebdd6fcb651df6a6f69deba9cfb602c9789ac1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:54:06 +0000 Subject: [PATCH 25/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 4e425b9..377fd26 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.15.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -145,6 +145,9 @@ make test %changelog +* Mon Jan 20 2025 Fedora Release Engineering - 0.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Nov 21 2024 Remi Collet - 0.15.0-1 - update to 0.15.0 From 7053e4910f7dee98deb80648c884cacfa293ca3f Mon Sep 17 00:00:00 2001 From: Jakub Haruda Date: Thu, 17 Jul 2025 13:14:37 +0200 Subject: [PATCH 26/27] fmf: Convert STI test to TMT --- .fmf/version | 1 + tests/Sanity/Sanity-test-for-librabbitmq/main.fmf | 14 ++++++++++++++ .../Sanity/Sanity-test-for-librabbitmq/runtest.sh | 3 +-- tests/tests.yml | 11 ----------- 4 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 .fmf/version create mode 100644 tests/Sanity/Sanity-test-for-librabbitmq/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/Sanity/Sanity-test-for-librabbitmq/main.fmf b/tests/Sanity/Sanity-test-for-librabbitmq/main.fmf new file mode 100644 index 0000000..a7116fe --- /dev/null +++ b/tests/Sanity/Sanity-test-for-librabbitmq/main.fmf @@ -0,0 +1,14 @@ +summary: tests basic functionality +description: '' +contact: Than Ngo +component: + - librabbitmq +test: ./runtest.sh +framework: beakerlib +recommend: + - librabbitmq + - librabbitmq-devel + - objdump +duration: 5m +extra-summary: /CoreOS/librabbitmq/Sanity/Sanity-test-for-librabbitmq +extra-task: /CoreOS/librabbitmq/Sanity/Sanity-test-for-librabbitmq diff --git a/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh b/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh index 76ed9f6..43816cb 100755 --- a/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh +++ b/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh @@ -29,7 +29,6 @@ PACKAGES="librabbitmq librabbitmq-devel" # source the test script helpers -. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 rlJournalStart @@ -47,7 +46,7 @@ rlJournalStart rlRun "objdump -T $o" 0 "validate the shared objects" done rlRun "head /usr/share/doc/librabbitmq-devel/README.md" 0 "correct form for doc file" - rlRun "head /usr/share/licenses/librabbitmq/LICENSE-MIT" 0 "correct form for doc file" + rlRun "head /usr/share/licenses/librabbitmq/LICENSE" 0 "correct form for doc file" rlPhaseEnd rlPhaseStartCleanup diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 96c2b94..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Run tests in all contexts -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - Sanity - required_packages: - - librabbitmq From 0405ef6dd099c86f096c799b5f0a90c5a64985bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:14:17 +0000 Subject: [PATCH 27/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- librabbitmq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index 377fd26..deafdfa 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -19,7 +19,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.15.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -145,6 +145,9 @@ make test %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jan 20 2025 Fedora Release Engineering - 0.15.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild