From b005c798fb2ceab3e0ceec27dfb9fd3bf1bce9e9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:58:19 +0000 Subject: [PATCH 01/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 87ab082..adf315a 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.8.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -132,6 +132,9 @@ make %{?_smp_mflags} check %endif %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.8.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 3.8.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From fabd26c70fa6a022a2603377f3b38d6d89f05e93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:44:16 +0000 Subject: [PATCH 02/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index adf315a..d73505b 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.8.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -132,6 +132,9 @@ make %{?_smp_mflags} check %endif %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.8.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 3.8.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ef2931bf970b6b3dd3a68e68d9c75ad8864409ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:34:55 +0000 Subject: [PATCH 03/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index d73505b..b77ba30 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.8.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -132,6 +132,9 @@ make %{?_smp_mflags} check %endif %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.8.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 3.8.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 0edac773049fcd4ff57a261125ce755ea4c9c5fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:23:32 +0000 Subject: [PATCH 04/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index b77ba30..56caafe 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.8.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -132,6 +132,9 @@ make %{?_smp_mflags} check %endif %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 3.8.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 3.8.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 48cb158e4e3670bd55613873521bab18b3995689 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:50:25 +0000 Subject: [PATCH 05/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 56caafe..b44b9f0 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.8.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -132,6 +132,9 @@ make %{?_smp_mflags} check %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.8.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 3.8.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From ab2263cf6b972f641a07d9f7bf81cd329eb441ff Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:54:02 +0100 Subject: [PATCH 06/21] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- activemq-cpp.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index b44b9f0..eb400fb 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -104,9 +104,6 @@ make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la rm $RPM_BUILD_ROOT/%{_bindir}/example -%clean -rm -rf $RPM_BUILD_ROOT - %check make %{?_smp_mflags} check From f537987c1ae726f068476f2ebe30e6db1b6db061 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 13 Apr 2018 16:19:54 +0200 Subject: [PATCH 07/21] New from upstream Add patch for openssl1 --- .gitignore | 1 + activemq-cpp-openssl1.patch | 18 ++++++++++++++++++ activemq-cpp.spec | 12 ++++++++++-- sources | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 activemq-cpp-openssl1.patch diff --git a/.gitignore b/.gitignore index 4fb094b..0f71b60 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.8.2-src.tar.gz /activemq-cpp-library-3.8.3-src.tar.gz /activemq-cpp-library-3.8.4-src.tar.gz +/activemq-cpp-library-3.9.4-src.tar.gz diff --git a/activemq-cpp-openssl1.patch b/activemq-cpp-openssl1.patch new file mode 100644 index 0000000..5aa216c --- /dev/null +++ b/activemq-cpp-openssl1.patch @@ -0,0 +1,18 @@ +--- activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 2017-10-24 09:21:39.284236953 +0100 ++++ activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 2017-10-24 09:24:46.925846965 +0100 +@@ -664,11 +664,12 @@ + break; + } + +- const unsigned char* data = extension->value->data; ++ const unsigned char* data = ASN1_STRING_data(X509_EXTENSION_get_data(extension)); ++ const size_t length = ASN1_STRING_length(X509_EXTENSION_get_data(extension)); + STACK_OF(CONF_VALUE)* confValue = method->i2v(method, + method->it ? +- ASN1_item_d2i(NULL, &data, extension->value->length, ASN1_ITEM_ptr(method->it)) : +- method->d2i(NULL, &data, extension->value->length), NULL); ++ ASN1_item_d2i(NULL, &data, length, ASN1_ITEM_ptr(method->it)) : ++ method->d2i(NULL, &data, length), NULL); + + CONF_VALUE* value = NULL; + diff --git a/activemq-cpp.spec b/activemq-cpp.spec index eb400fb..f255579 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,8 +1,8 @@ %global with_docs 0 Name: activemq-cpp -Version: 3.8.4 -Release: 8%{?dist} +Version: 3.9.4 +Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -12,6 +12,9 @@ Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{version}/acti Patch0: activemq-cpp-3.8.2-system-zlib.patch # Some local texmf configuration to increase default pool_size. Patch1: activemq-cpp-local-texmf.patch +# Openssl 1.1.0 +# http://activemq.2283324.n4.nabble.com/activemq-cpp-3-9-4-fails-to-build-fedora-rawhide-openssl-1-1-0e-related-td4724037.html +Patch2: activemq-cpp-openssl1.patch BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -79,6 +82,7 @@ rm -r src/main/decaf/internal/util/zip %if %{?with_docs}0 %patch1 -p1 %endif +%patch2 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp @@ -129,6 +133,10 @@ make %{?_smp_mflags} check %endif %changelog +* Fri Apr 13 2018 Steve Traylen - 3.9.4-1 +- New from upstream +- Add patch for openssl1 + * Wed Feb 07 2018 Fedora Release Engineering - 3.8.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index cfbed06..1262ac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7df2becbb778af40b58c3109e18fdf32 activemq-cpp-library-3.8.4-src.tar.gz +SHA512 (activemq-cpp-library-3.9.4-src.tar.gz) = 58b71acba98034578819ea0b63ca6d90168d6231e24a1d9d6a42d54ca7b7be5cf6eb82054c50ea4c3f29a2f0155433f2886226e4910ed8621474bd1315050f13 From d8059eb9b2580948b57a63f731256a058c2227a8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:42 +0200 Subject: [PATCH 08/21] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- activemq-cpp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index f255579..eabd30e 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -16,6 +16,7 @@ Patch1: activemq-cpp-local-texmf.patch # http://activemq.2283324.n4.nabble.com/activemq-cpp-3-9-4-fails-to-build-fedora-rawhide-openssl-1-1-0e-related-td4724037.html Patch2: activemq-cpp-openssl1.patch +BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: zlib-devel %if %{?with_docs}0 From b8d710f8cbbf7186d504bc21db094c7d78d3f91f Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:09:27 -0500 Subject: [PATCH 09/21] Remove needless use of %defattr --- activemq-cpp.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index eabd30e..8c6c608 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -116,12 +116,10 @@ make %{?_smp_mflags} check %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %{_libdir}/lib%{name}.so.* %doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt %files devel -%defattr(-,root,root,-) %{_libdir}/lib%{name}.so %{_includedir}/%{name}-%{version} %{_libdir}/pkgconfig/%{name}.pc @@ -129,7 +127,6 @@ make %{?_smp_mflags} check %if %{?with_docs}0 %files doc -%defattr(-,root,root,-) %doc doc/%{name}.pdf %endif From 81a3ffe9762e40da583098cfad9a24ac2a7a492a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:58:23 +0000 Subject: [PATCH 10/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 8c6c608..7d3cf24 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -131,6 +131,9 @@ make %{?_smp_mflags} check %endif %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 3.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Apr 13 2018 Steve Traylen - 3.9.4-1 - New from upstream - Add patch for openssl1 From f233a3cd578c638c0d7e19bc625416696dbb9e54 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:38:28 +0100 Subject: [PATCH 11/21] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- activemq-cpp.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 7d3cf24..919e3d1 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -112,8 +112,7 @@ rm $RPM_BUILD_ROOT/%{_bindir}/example %check make %{?_smp_mflags} check -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %{_libdir}/lib%{name}.so.* From dd4da2c27b0ae90b0ca6d028f8484b4a3416d821 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 12/21] Remove obsolete Group tag Signed-off-by: Igor Gnatenko --- activemq-cpp.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 919e3d1..b37fd7c 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -5,7 +5,6 @@ Version: 3.9.4 Release: 2%{?dist} Summary: C++ implementation of JMS-like messaging client -Group: Development/Libraries License: ASL 2.0 URL: http://activemq.apache.org/cms/ Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{version}/activemq-cpp-library-%{version}-src.tar.gz @@ -38,7 +37,6 @@ ActiveMQ is still needed for your clients to communicate. %package devel Summary: C++ implementation header files for JMS-like messaging -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 @@ -60,7 +58,6 @@ for your clients to communicate. %if %{?with_docs}0 %package doc Summary: C++ implementation header files for JMS-like messaging -Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif From c90f4f625886b07a417872f00ce89a6c82e28fbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:56:01 +0000 Subject: [PATCH 13/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index b37fd7c..72f00bb 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.9.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ implementation of JMS-like messaging client License: ASL 2.0 @@ -127,6 +127,9 @@ make %{?_smp_mflags} check %endif %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.9.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 3.9.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 329fb75d9ef007b18a791f0eab24af817c648a3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:31:19 +0000 Subject: [PATCH 14/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 72f00bb..a594d72 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.9.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ implementation of JMS-like messaging client License: ASL 2.0 @@ -127,6 +127,9 @@ make %{?_smp_mflags} check %endif %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.9.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 3.9.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a05f9c0b35ad3cc36da8fd5f117d3e1c780cda1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 13:28:07 +0000 Subject: [PATCH 15/21] activemq-cpp fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674632 --- .gitignore | 13 -- activemq-cpp-3.8.2-system-zlib.patch | 177 ------------------ activemq-cpp-gcc47.patch | 12 -- activemq-cpp-local-texmf.patch | 24 --- activemq-cpp-openssl1.patch | 18 -- activemq-cpp.spec | 257 --------------------------- dead.package | 1 + sources | 1 - 8 files changed, 1 insertion(+), 502 deletions(-) delete mode 100644 .gitignore delete mode 100644 activemq-cpp-3.8.2-system-zlib.patch delete mode 100644 activemq-cpp-gcc47.patch delete mode 100644 activemq-cpp-local-texmf.patch delete mode 100644 activemq-cpp-openssl1.patch delete mode 100644 activemq-cpp.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0f71b60..0000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -activemq-cpp-library-3.2.1-src.tar.gz -/activemq-cpp-library-3.2.3-src.tar.gz -/activemq-cpp-library-3.2.4-src.tar.gz -/activemq-cpp-library-3.2.5-src.tar.gz -/activemq-cpp-library-3.3.0-src.tar.gz -/activemq-cpp-library-3.4.0-src.tar.gz -/activemq-cpp-library-3.4.1-src.tar.gz -/activemq-cpp-library-3.4.4-src.tar.gz -/activemq-cpp-library-3.7.1-src.tar.gz -/activemq-cpp-library-3.8.2-src.tar.gz -/activemq-cpp-library-3.8.3-src.tar.gz -/activemq-cpp-library-3.8.4-src.tar.gz -/activemq-cpp-library-3.9.4-src.tar.gz diff --git a/activemq-cpp-3.8.2-system-zlib.patch b/activemq-cpp-3.8.2-system-zlib.patch deleted file mode 100644 index c14e202..0000000 --- a/activemq-cpp-3.8.2-system-zlib.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff --git a/src/main/Makefile.am b/src/main/Makefile.am -index 5d117aa..9e71d92 100644 ---- a/src/main/Makefile.am -+++ b/src/main/Makefile.am -@@ -385,20 +385,6 @@ cc_sources = \ - decaf/internal/util/concurrent/Threading.cpp \ - decaf/internal/util/concurrent/unix/Atomics.cpp \ - decaf/internal/util/concurrent/unix/PlatformThread.cpp \ -- decaf/internal/util/zip/adler32.c \ -- decaf/internal/util/zip/crc32.c \ -- decaf/internal/util/zip/deflate.c \ -- decaf/internal/util/zip/gzclose.c \ -- decaf/internal/util/zip/gzlib.c \ -- decaf/internal/util/zip/gzread.c \ -- decaf/internal/util/zip/gzwrite.c \ -- decaf/internal/util/zip/infback.c \ -- decaf/internal/util/zip/inffast.c \ -- decaf/internal/util/zip/inflate.c \ -- decaf/internal/util/zip/inftrees.c \ -- decaf/internal/util/zip/trees.c \ -- decaf/internal/util/zip/uncompr.c \ -- decaf/internal/util/zip/zutil.c \ - decaf/io/BlockingByteArrayInputStream.cpp \ - decaf/io/BufferedInputStream.cpp \ - decaf/io/BufferedOutputStream.cpp \ -@@ -1042,17 +1028,6 @@ h_sources = \ - decaf/internal/util/concurrent/Transferer.h \ - decaf/internal/util/concurrent/unix/PlatformDefs.h \ - decaf/internal/util/concurrent/windows/PlatformDefs.h \ -- decaf/internal/util/zip/crc32.h \ -- decaf/internal/util/zip/deflate.h \ -- decaf/internal/util/zip/gzguts.h \ -- decaf/internal/util/zip/inffast.h \ -- decaf/internal/util/zip/inffixed.h \ -- decaf/internal/util/zip/inflate.h \ -- decaf/internal/util/zip/inftrees.h \ -- decaf/internal/util/zip/trees.h \ -- decaf/internal/util/zip/zconf.h \ -- decaf/internal/util/zip/zlib.h \ -- decaf/internal/util/zip/zutil.h \ - decaf/io/BlockingByteArrayInputStream.h \ - decaf/io/BufferedInputStream.h \ - decaf/io/BufferedOutputStream.h \ -@@ -1327,7 +1302,7 @@ libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources) - libactivemq_cpp_la_CXXFLAGS= $(AMQ_CXXFLAGS) - libactivemq_cpp_la_CFLAGS= $(AMQ_CFLAGS) - libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION) --libactivemq_cpp_la_LIBADD= $(AMQ_LIBS) -+libactivemq_cpp_la_LIBADD= $(AMQ_LIBS) -lz - - ## - ## Packaging Info -diff --git a/src/main/Makefile.in b/src/main/Makefile.in -index a53e327..53e79c1 100644 ---- a/src/main/Makefile.in -+++ b/src/main/Makefile.in -@@ -493,20 +493,6 @@ am__objects_2 = activemq/cmsutil/libactivemq_cpp_la-CachedConsumer.lo \ - decaf/internal/util/concurrent/libactivemq_cpp_la-Threading.lo \ - decaf/internal/util/concurrent/unix/libactivemq_cpp_la-Atomics.lo \ - decaf/internal/util/concurrent/unix/libactivemq_cpp_la-PlatformThread.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-adler32.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-crc32.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-deflate.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-gzclose.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-gzlib.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-gzread.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-gzwrite.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-infback.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-inffast.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-inflate.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-inftrees.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-trees.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-uncompr.lo \ -- decaf/internal/util/zip/libactivemq_cpp_la-zutil.lo \ - decaf/io/libactivemq_cpp_la-BlockingByteArrayInputStream.lo \ - decaf/io/libactivemq_cpp_la-BufferedInputStream.lo \ - decaf/io/libactivemq_cpp_la-BufferedOutputStream.lo \ -@@ -1346,20 +1332,6 @@ cc_sources = \ - decaf/internal/util/concurrent/Threading.cpp \ - decaf/internal/util/concurrent/unix/Atomics.cpp \ - decaf/internal/util/concurrent/unix/PlatformThread.cpp \ -- decaf/internal/util/zip/adler32.c \ -- decaf/internal/util/zip/crc32.c \ -- decaf/internal/util/zip/deflate.c \ -- decaf/internal/util/zip/gzclose.c \ -- decaf/internal/util/zip/gzlib.c \ -- decaf/internal/util/zip/gzread.c \ -- decaf/internal/util/zip/gzwrite.c \ -- decaf/internal/util/zip/infback.c \ -- decaf/internal/util/zip/inffast.c \ -- decaf/internal/util/zip/inflate.c \ -- decaf/internal/util/zip/inftrees.c \ -- decaf/internal/util/zip/trees.c \ -- decaf/internal/util/zip/uncompr.c \ -- decaf/internal/util/zip/zutil.c \ - decaf/io/BlockingByteArrayInputStream.cpp \ - decaf/io/BufferedInputStream.cpp \ - decaf/io/BufferedOutputStream.cpp \ -@@ -2002,17 +1974,6 @@ h_sources = \ - decaf/internal/util/concurrent/Transferer.h \ - decaf/internal/util/concurrent/unix/PlatformDefs.h \ - decaf/internal/util/concurrent/windows/PlatformDefs.h \ -- decaf/internal/util/zip/crc32.h \ -- decaf/internal/util/zip/deflate.h \ -- decaf/internal/util/zip/gzguts.h \ -- decaf/internal/util/zip/inffast.h \ -- decaf/internal/util/zip/inffixed.h \ -- decaf/internal/util/zip/inflate.h \ -- decaf/internal/util/zip/inftrees.h \ -- decaf/internal/util/zip/trees.h \ -- decaf/internal/util/zip/zconf.h \ -- decaf/internal/util/zip/zlib.h \ -- decaf/internal/util/zip/zutil.h \ - decaf/io/BlockingByteArrayInputStream.h \ - decaf/io/BufferedInputStream.h \ - decaf/io/BufferedOutputStream.h \ -@@ -2282,7 +2243,7 @@ libactivemq_cpp_la_SOURCES = $(h_sources) $(cc_sources) - libactivemq_cpp_la_CXXFLAGS = $(AMQ_CXXFLAGS) - libactivemq_cpp_la_CFLAGS = $(AMQ_CFLAGS) - libactivemq_cpp_la_LDFLAGS = -version-info $(ACTIVEMQ_LIBRARY_VERSION) --libactivemq_cpp_la_LIBADD = $(AMQ_LIBS) -+libactivemq_cpp_la_LIBADD = $(AMQ_LIBS) -lz - library_includedir = $(includedir)/$(ACTIVEMQ_LIBRARY_NAME)-$(ACTIVEMQ_VERSION) - nobase_library_include_HEADERS = $(h_sources) - all: all-am -diff --git a/src/main/decaf/util/zip/Adler32.cpp b/src/main/decaf/util/zip/Adler32.cpp -index 517fbb4..f1fcd3c 100644 ---- a/src/main/decaf/util/zip/Adler32.cpp -+++ b/src/main/decaf/util/zip/Adler32.cpp -@@ -17,7 +17,7 @@ - - #include "Adler32.h" - --#include -+#include - - using namespace decaf; - using namespace decaf::lang; -diff --git a/src/main/decaf/util/zip/CRC32.cpp b/src/main/decaf/util/zip/CRC32.cpp -index 5d3b308..8b100bc 100644 ---- a/src/main/decaf/util/zip/CRC32.cpp -+++ b/src/main/decaf/util/zip/CRC32.cpp -@@ -17,7 +17,7 @@ - - #include "CRC32.h" - --#include -+#include - - using namespace decaf; - using namespace decaf::lang; -diff --git a/src/main/decaf/util/zip/Deflater.cpp b/src/main/decaf/util/zip/Deflater.cpp -index 12f4184..be21808 100644 ---- a/src/main/decaf/util/zip/Deflater.cpp -+++ b/src/main/decaf/util/zip/Deflater.cpp -@@ -20,7 +20,7 @@ - #include - #include - --#include -+#include - #include - - using namespace decaf; -diff --git a/src/main/decaf/util/zip/Inflater.cpp b/src/main/decaf/util/zip/Inflater.cpp -index bb0923f..e0dde29 100644 ---- a/src/main/decaf/util/zip/Inflater.cpp -+++ b/src/main/decaf/util/zip/Inflater.cpp -@@ -20,7 +20,7 @@ - #include - #include - --#include -+#include - - #include - diff --git a/activemq-cpp-gcc47.patch b/activemq-cpp-gcc47.patch deleted file mode 100644 index 2e5c962..0000000 --- a/activemq-cpp-gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h ---- activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:37:49.536000023 +0100 -+++ activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:38:56.722000023 +0100 -@@ -60,7 +60,7 @@ - */ - virtual bool add( const E& value ) { - -- if( offer( value ) ) { -+ if( this->offer( value ) ) { - return true; - } - diff --git a/activemq-cpp-local-texmf.patch b/activemq-cpp-local-texmf.patch deleted file mode 100644 index 8989a32..0000000 --- a/activemq-cpp-local-texmf.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr activemq-cpp-2.2.6.ORIG/texmf.cnf activemq-cpp-2.2.6/texmf.cnf ---- activemq-cpp-2.2.6.ORIG/texmf.cnf 1970-01-01 01:00:00.000000000 +0100 -+++ activemq-cpp-2.2.6/texmf.cnf 2009-11-07 20:47:00.466113909 +0100 -@@ -0,0 +1,2 @@ -+pool_size = 4000000 -+ -diff -uNr activemq-cpp-2.2.6.ORIG/doxygen-include.am activemq-cpp-2.2.6/doxygen-include.am ---- activemq-cpp-2.2.6.ORIG/doxygen-include.am 2009-01-23 14:56:26.000000000 +0100 -+++ activemq-cpp-2.2.6/doxygen-include.am 2009-11-07 20:52:10.558509912 +0100 -@@ -153,12 +153,12 @@ - rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ - $(DX_PDFLATEX) refman.tex; \ - $(DX_MAKEINDEX) refman.idx; \ -- $(DX_PDFLATEX) refman.tex; \ -+ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \ - countdown=5; \ - while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ - refman.log > /dev/null 2>&1 \ - && test $$countdown -gt 0; do \ -- $(DX_PDFLATEX) refman.tex; \ -+ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \ - countdown=`expr $$countdown - 1`; \ - done; \ - mv refman.pdf ../@PACKAGE@.pdf diff --git a/activemq-cpp-openssl1.patch b/activemq-cpp-openssl1.patch deleted file mode 100644 index 5aa216c..0000000 --- a/activemq-cpp-openssl1.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 2017-10-24 09:21:39.284236953 +0100 -+++ activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 2017-10-24 09:24:46.925846965 +0100 -@@ -664,11 +664,12 @@ - break; - } - -- const unsigned char* data = extension->value->data; -+ const unsigned char* data = ASN1_STRING_data(X509_EXTENSION_get_data(extension)); -+ const size_t length = ASN1_STRING_length(X509_EXTENSION_get_data(extension)); - STACK_OF(CONF_VALUE)* confValue = method->i2v(method, - method->it ? -- ASN1_item_d2i(NULL, &data, extension->value->length, ASN1_ITEM_ptr(method->it)) : -- method->d2i(NULL, &data, extension->value->length), NULL); -+ ASN1_item_d2i(NULL, &data, length, ASN1_ITEM_ptr(method->it)) : -+ method->d2i(NULL, &data, length), NULL); - - CONF_VALUE* value = NULL; - diff --git a/activemq-cpp.spec b/activemq-cpp.spec deleted file mode 100644 index a594d72..0000000 --- a/activemq-cpp.spec +++ /dev/null @@ -1,257 +0,0 @@ -%global with_docs 0 - -Name: activemq-cpp -Version: 3.9.4 -Release: 4%{?dist} -Summary: C++ implementation of JMS-like messaging client - -License: ASL 2.0 -URL: http://activemq.apache.org/cms/ -Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{version}/activemq-cpp-library-%{version}-src.tar.gz -Patch0: activemq-cpp-3.8.2-system-zlib.patch -# Some local texmf configuration to increase default pool_size. -Patch1: activemq-cpp-local-texmf.patch -# Openssl 1.1.0 -# http://activemq.2283324.n4.nabble.com/activemq-cpp-3-9-4-fails-to-build-fedora-rawhide-openssl-1-1-0e-related-td4724037.html -Patch2: activemq-cpp-openssl1.patch - -BuildRequires: gcc -BuildRequires: openssl-devel -BuildRequires: zlib-devel -%if %{?with_docs}0 -BuildRequires: doxygen -BuildRequires: graphviz -BuildRequires: tex(latex) -%endif -BuildRequires: apr-util-devel >= 1.3 -BuildRequires: cppunit-devel >= 1.10.2 -BuildRequires: libuuid-devel - -%description -activemq-cpp is a JMS-like API for C++ for interfacing with Message -Brokers such as Apache ActiveMQ. C++ messaging service helps to make your -C++ client code much neater and easier to follow. To get a better feel for -CMS try the API Reference. -ActiveMQ-CPP is a client only library, a message broker such as Apache -ActiveMQ is still needed for your clients to communicate. - -%package devel -Summary: C++ implementation header files for JMS-like messaging -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 -Requires: libuuid-devel -%else -Requires: e2fsprogs-devel -%endif - -%description devel -activemq-cpp is a JMS-like API for C++ for interfacing with Message -Brokers such as Apache ActiveMQ. C++ messaging service helps to make -your C++ client code much neater and easier to follow. To get a better -feel for CMS try the API Reference. ActiveMQ-CPP is a client only -library, a message broker such as Apache ActiveMQ is still needed -for your clients to communicate. - -%{name}-devel contains development header files. - -%if %{?with_docs}0 -%package doc -Summary: C++ implementation header files for JMS-like messaging -%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 -BuildArch: noarch -%endif - -%description doc -activemq-cpp is a JMS-like API for C++ for interfacing with Message -Brokers such as Apache ActiveMQ. C++ messaging service helps to make -your C++ client code much neater and easier to follow. To get a better -feel for CMS try the API Reference. ActiveMQ-CPP is a client only -library, a message broker such as Apache ActiveMQ is still needed -for your clients to communicate. - -%{name}-doc contains api documentation. -%endif - -%prep -%setup -q -n activemq-cpp-library-%{version} -%patch0 -p1 -rm -r src/main/decaf/internal/util/zip -%if %{?with_docs}0 -%patch1 -p1 -%endif -%patch2 -p1 -chmod 644 LICENSE.txt -chmod 644 src/main/activemq/transport/mock/MockTransport.cpp - - -%build -# Build pdf(30MB) rather than default html(400MB). -%if %{?with_docs}0 -%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf -%else -%configure --disable-static -%endif - -make %{?_smp_mflags} -%if %{?with_docs}0 -make %{?_smp_mflags} doxygen-run -cp -p texmf.cnf doc/latex/texmf.cnf -make %{?_smp_mflags} doxygen-pdf -%endif - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la -rm $RPM_BUILD_ROOT/%{_bindir}/example - -%check -make %{?_smp_mflags} check - -%ldconfig_scriptlets - -%files -%{_libdir}/lib%{name}.so.* -%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt - -%files devel -%{_libdir}/lib%{name}.so -%{_includedir}/%{name}-%{version} -%{_libdir}/pkgconfig/%{name}.pc -%{_bindir}/activemqcpp-config - -%if %{?with_docs}0 -%files doc -%doc doc/%{name}.pdf -%endif - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 3.9.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 3.9.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 3.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Apr 13 2018 Steve Traylen - 3.9.4-1 -- New from upstream -- Add patch for openssl1 - -* Wed Feb 07 2018 Fedora Release Engineering - 3.8.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 3.8.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.8.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.8.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 3.8.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 3.8.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 3.8.4-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Wed Mar 11 2015 Steve Traylen - 3.8.4-1 -- Upstream to 3.8.4 - -* Wed Aug 27 2014 Steve Traylen - 3.8.3-1 -- Upstream to 3.8.3 - -* Fri Aug 15 2014 Fedora Release Engineering - 3.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 3.8.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Ville Skyttä - 3.8.2-2 -- Patch to use system zlib instead of bundled one - -* Thu Jan 23 2014 Steve Traylen - 3.8.2-1 -- Upstream to 3.8.2 - -* Wed Sep 4 2013 Steve Traylen - 3.7.1-1 -- Upstream to 3.7.1 - -* Sat Aug 03 2013 Fedora Release Engineering - 3.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 3.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Sep 16 2012 Steve Traylen - 3.4.4-1 -- Upstream to 3.4.4 - -* Wed Jul 18 2012 Fedora Release Engineering - 3.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 3.4.1-2 -- Rebuilt for c++ ABI breakage - -* Sun Feb 12 2012 Steve Traylen - 3.4.1-1 -- Upstream to 3.4.1 -- Add patch for gcc47, AMQCPP-389 - -* Thu Jan 12 2012 Fedora Release Engineering - 3.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Jul 10 2011 Steve Traylen - 3.4.0-1 -- Upstream to 3.4.0 - -* Mon Apr 18 2011 Steve Traylen - 3.3.0-1 -- Upstream to 3.3.0 - -* Mon Mar 7 2011 Steve Traylen - 3.2.5-1 -- autoconf step removed. -- Upstream to 3.2.5 - -* Mon Feb 07 2011 Fedora Release Engineering - 3.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Feb 6 2011 Steve Traylen - 3.2.4-1 -- Upstream to 3.2.4 - -* Wed Nov 10 2010 Steve Traylen - 3.2.3-1 -- Upstream to 3.2.3 - -* Thu Jul 22 2010 Steve Traylen - 3.2.1-1 -- Upstream to 3.2.1 -- Add BR of openssl-devel since library now supports ssl - connections. - -* Sat Apr 3 2010 Steve Traylen - 3.1.2-1 -- Upstream to 3.1.2 - -* Sat Jan 9 2010 Steve Traylen - 3.1.0-1 -- Upstream to 3.1.0 - -* Fri Dec 11 2009 Steve Traylen - 3.0.1-1 -- Upstream to 3.0.1 -- Tar ball name change. - -* Fri Dec 11 2009 Steve Traylen - 2.2.6-5 -- Add libuuid-devel as Requires to -devel package. - -* Sat Nov 14 2009 Steve Traylen - 2.2.6-4 -- Remove patch to relocate headers from versioned directory. -- Add make smp options to make check. - -* Fri Nov 6 2009 Steve Traylen - 2.2.6-3 -- Relocate headers to non versioned directory with patch0 - -* Fri Nov 6 2009 Steve Traylen - 2.2.6-2 -- Adapted to Fedora guidelines. - -* Thu Feb 26 2009 Ricardo Rocha - 2.2.6-1 -- First version of the spec file - - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e568e92 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +activemq-cpp fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674632 diff --git a/sources b/sources deleted file mode 100644 index 1262ac0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (activemq-cpp-library-3.9.4-src.tar.gz) = 58b71acba98034578819ea0b63ca6d90168d6231e24a1d9d6a42d54ca7b7be5cf6eb82054c50ea4c3f29a2f0155433f2886226e4910ed8621474bd1315050f13 From f8820a33a083906bd726e02abd36a4b5fd319e71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 13 Apr 2024 04:47:43 +0000 Subject: [PATCH 16/21] Unretirement Releng Request: https://pagure.io/releng/issue/12062 Signed-off-by: Fedora Release Engineering --- .gitignore | 13 ++ activemq-cpp-3.8.2-system-zlib.patch | 177 ++++++++++++++++++ activemq-cpp-gcc47.patch | 12 ++ activemq-cpp-local-texmf.patch | 24 +++ activemq-cpp-openssl1.patch | 18 ++ activemq-cpp.spec | 257 +++++++++++++++++++++++++++ dead.package | 1 - sources | 1 + 8 files changed, 502 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 activemq-cpp-3.8.2-system-zlib.patch create mode 100644 activemq-cpp-gcc47.patch create mode 100644 activemq-cpp-local-texmf.patch create mode 100644 activemq-cpp-openssl1.patch create mode 100644 activemq-cpp.spec delete mode 100644 dead.package create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0f71b60 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +activemq-cpp-library-3.2.1-src.tar.gz +/activemq-cpp-library-3.2.3-src.tar.gz +/activemq-cpp-library-3.2.4-src.tar.gz +/activemq-cpp-library-3.2.5-src.tar.gz +/activemq-cpp-library-3.3.0-src.tar.gz +/activemq-cpp-library-3.4.0-src.tar.gz +/activemq-cpp-library-3.4.1-src.tar.gz +/activemq-cpp-library-3.4.4-src.tar.gz +/activemq-cpp-library-3.7.1-src.tar.gz +/activemq-cpp-library-3.8.2-src.tar.gz +/activemq-cpp-library-3.8.3-src.tar.gz +/activemq-cpp-library-3.8.4-src.tar.gz +/activemq-cpp-library-3.9.4-src.tar.gz diff --git a/activemq-cpp-3.8.2-system-zlib.patch b/activemq-cpp-3.8.2-system-zlib.patch new file mode 100644 index 0000000..c14e202 --- /dev/null +++ b/activemq-cpp-3.8.2-system-zlib.patch @@ -0,0 +1,177 @@ +diff --git a/src/main/Makefile.am b/src/main/Makefile.am +index 5d117aa..9e71d92 100644 +--- a/src/main/Makefile.am ++++ b/src/main/Makefile.am +@@ -385,20 +385,6 @@ cc_sources = \ + decaf/internal/util/concurrent/Threading.cpp \ + decaf/internal/util/concurrent/unix/Atomics.cpp \ + decaf/internal/util/concurrent/unix/PlatformThread.cpp \ +- decaf/internal/util/zip/adler32.c \ +- decaf/internal/util/zip/crc32.c \ +- decaf/internal/util/zip/deflate.c \ +- decaf/internal/util/zip/gzclose.c \ +- decaf/internal/util/zip/gzlib.c \ +- decaf/internal/util/zip/gzread.c \ +- decaf/internal/util/zip/gzwrite.c \ +- decaf/internal/util/zip/infback.c \ +- decaf/internal/util/zip/inffast.c \ +- decaf/internal/util/zip/inflate.c \ +- decaf/internal/util/zip/inftrees.c \ +- decaf/internal/util/zip/trees.c \ +- decaf/internal/util/zip/uncompr.c \ +- decaf/internal/util/zip/zutil.c \ + decaf/io/BlockingByteArrayInputStream.cpp \ + decaf/io/BufferedInputStream.cpp \ + decaf/io/BufferedOutputStream.cpp \ +@@ -1042,17 +1028,6 @@ h_sources = \ + decaf/internal/util/concurrent/Transferer.h \ + decaf/internal/util/concurrent/unix/PlatformDefs.h \ + decaf/internal/util/concurrent/windows/PlatformDefs.h \ +- decaf/internal/util/zip/crc32.h \ +- decaf/internal/util/zip/deflate.h \ +- decaf/internal/util/zip/gzguts.h \ +- decaf/internal/util/zip/inffast.h \ +- decaf/internal/util/zip/inffixed.h \ +- decaf/internal/util/zip/inflate.h \ +- decaf/internal/util/zip/inftrees.h \ +- decaf/internal/util/zip/trees.h \ +- decaf/internal/util/zip/zconf.h \ +- decaf/internal/util/zip/zlib.h \ +- decaf/internal/util/zip/zutil.h \ + decaf/io/BlockingByteArrayInputStream.h \ + decaf/io/BufferedInputStream.h \ + decaf/io/BufferedOutputStream.h \ +@@ -1327,7 +1302,7 @@ libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources) + libactivemq_cpp_la_CXXFLAGS= $(AMQ_CXXFLAGS) + libactivemq_cpp_la_CFLAGS= $(AMQ_CFLAGS) + libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION) +-libactivemq_cpp_la_LIBADD= $(AMQ_LIBS) ++libactivemq_cpp_la_LIBADD= $(AMQ_LIBS) -lz + + ## + ## Packaging Info +diff --git a/src/main/Makefile.in b/src/main/Makefile.in +index a53e327..53e79c1 100644 +--- a/src/main/Makefile.in ++++ b/src/main/Makefile.in +@@ -493,20 +493,6 @@ am__objects_2 = activemq/cmsutil/libactivemq_cpp_la-CachedConsumer.lo \ + decaf/internal/util/concurrent/libactivemq_cpp_la-Threading.lo \ + decaf/internal/util/concurrent/unix/libactivemq_cpp_la-Atomics.lo \ + decaf/internal/util/concurrent/unix/libactivemq_cpp_la-PlatformThread.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-adler32.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-crc32.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-deflate.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-gzclose.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-gzlib.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-gzread.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-gzwrite.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-infback.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-inffast.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-inflate.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-inftrees.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-trees.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-uncompr.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-zutil.lo \ + decaf/io/libactivemq_cpp_la-BlockingByteArrayInputStream.lo \ + decaf/io/libactivemq_cpp_la-BufferedInputStream.lo \ + decaf/io/libactivemq_cpp_la-BufferedOutputStream.lo \ +@@ -1346,20 +1332,6 @@ cc_sources = \ + decaf/internal/util/concurrent/Threading.cpp \ + decaf/internal/util/concurrent/unix/Atomics.cpp \ + decaf/internal/util/concurrent/unix/PlatformThread.cpp \ +- decaf/internal/util/zip/adler32.c \ +- decaf/internal/util/zip/crc32.c \ +- decaf/internal/util/zip/deflate.c \ +- decaf/internal/util/zip/gzclose.c \ +- decaf/internal/util/zip/gzlib.c \ +- decaf/internal/util/zip/gzread.c \ +- decaf/internal/util/zip/gzwrite.c \ +- decaf/internal/util/zip/infback.c \ +- decaf/internal/util/zip/inffast.c \ +- decaf/internal/util/zip/inflate.c \ +- decaf/internal/util/zip/inftrees.c \ +- decaf/internal/util/zip/trees.c \ +- decaf/internal/util/zip/uncompr.c \ +- decaf/internal/util/zip/zutil.c \ + decaf/io/BlockingByteArrayInputStream.cpp \ + decaf/io/BufferedInputStream.cpp \ + decaf/io/BufferedOutputStream.cpp \ +@@ -2002,17 +1974,6 @@ h_sources = \ + decaf/internal/util/concurrent/Transferer.h \ + decaf/internal/util/concurrent/unix/PlatformDefs.h \ + decaf/internal/util/concurrent/windows/PlatformDefs.h \ +- decaf/internal/util/zip/crc32.h \ +- decaf/internal/util/zip/deflate.h \ +- decaf/internal/util/zip/gzguts.h \ +- decaf/internal/util/zip/inffast.h \ +- decaf/internal/util/zip/inffixed.h \ +- decaf/internal/util/zip/inflate.h \ +- decaf/internal/util/zip/inftrees.h \ +- decaf/internal/util/zip/trees.h \ +- decaf/internal/util/zip/zconf.h \ +- decaf/internal/util/zip/zlib.h \ +- decaf/internal/util/zip/zutil.h \ + decaf/io/BlockingByteArrayInputStream.h \ + decaf/io/BufferedInputStream.h \ + decaf/io/BufferedOutputStream.h \ +@@ -2282,7 +2243,7 @@ libactivemq_cpp_la_SOURCES = $(h_sources) $(cc_sources) + libactivemq_cpp_la_CXXFLAGS = $(AMQ_CXXFLAGS) + libactivemq_cpp_la_CFLAGS = $(AMQ_CFLAGS) + libactivemq_cpp_la_LDFLAGS = -version-info $(ACTIVEMQ_LIBRARY_VERSION) +-libactivemq_cpp_la_LIBADD = $(AMQ_LIBS) ++libactivemq_cpp_la_LIBADD = $(AMQ_LIBS) -lz + library_includedir = $(includedir)/$(ACTIVEMQ_LIBRARY_NAME)-$(ACTIVEMQ_VERSION) + nobase_library_include_HEADERS = $(h_sources) + all: all-am +diff --git a/src/main/decaf/util/zip/Adler32.cpp b/src/main/decaf/util/zip/Adler32.cpp +index 517fbb4..f1fcd3c 100644 +--- a/src/main/decaf/util/zip/Adler32.cpp ++++ b/src/main/decaf/util/zip/Adler32.cpp +@@ -17,7 +17,7 @@ + + #include "Adler32.h" + +-#include ++#include + + using namespace decaf; + using namespace decaf::lang; +diff --git a/src/main/decaf/util/zip/CRC32.cpp b/src/main/decaf/util/zip/CRC32.cpp +index 5d3b308..8b100bc 100644 +--- a/src/main/decaf/util/zip/CRC32.cpp ++++ b/src/main/decaf/util/zip/CRC32.cpp +@@ -17,7 +17,7 @@ + + #include "CRC32.h" + +-#include ++#include + + using namespace decaf; + using namespace decaf::lang; +diff --git a/src/main/decaf/util/zip/Deflater.cpp b/src/main/decaf/util/zip/Deflater.cpp +index 12f4184..be21808 100644 +--- a/src/main/decaf/util/zip/Deflater.cpp ++++ b/src/main/decaf/util/zip/Deflater.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + #include + + using namespace decaf; +diff --git a/src/main/decaf/util/zip/Inflater.cpp b/src/main/decaf/util/zip/Inflater.cpp +index bb0923f..e0dde29 100644 +--- a/src/main/decaf/util/zip/Inflater.cpp ++++ b/src/main/decaf/util/zip/Inflater.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + + #include + diff --git a/activemq-cpp-gcc47.patch b/activemq-cpp-gcc47.patch new file mode 100644 index 0000000..2e5c962 --- /dev/null +++ b/activemq-cpp-gcc47.patch @@ -0,0 +1,12 @@ +diff -uNr activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h +--- activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:37:49.536000023 +0100 ++++ activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:38:56.722000023 +0100 +@@ -60,7 +60,7 @@ + */ + virtual bool add( const E& value ) { + +- if( offer( value ) ) { ++ if( this->offer( value ) ) { + return true; + } + diff --git a/activemq-cpp-local-texmf.patch b/activemq-cpp-local-texmf.patch new file mode 100644 index 0000000..8989a32 --- /dev/null +++ b/activemq-cpp-local-texmf.patch @@ -0,0 +1,24 @@ +diff -uNr activemq-cpp-2.2.6.ORIG/texmf.cnf activemq-cpp-2.2.6/texmf.cnf +--- activemq-cpp-2.2.6.ORIG/texmf.cnf 1970-01-01 01:00:00.000000000 +0100 ++++ activemq-cpp-2.2.6/texmf.cnf 2009-11-07 20:47:00.466113909 +0100 +@@ -0,0 +1,2 @@ ++pool_size = 4000000 ++ +diff -uNr activemq-cpp-2.2.6.ORIG/doxygen-include.am activemq-cpp-2.2.6/doxygen-include.am +--- activemq-cpp-2.2.6.ORIG/doxygen-include.am 2009-01-23 14:56:26.000000000 +0100 ++++ activemq-cpp-2.2.6/doxygen-include.am 2009-11-07 20:52:10.558509912 +0100 +@@ -153,12 +153,12 @@ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ + $(DX_PDFLATEX) refman.tex; \ + $(DX_MAKEINDEX) refman.idx; \ +- $(DX_PDFLATEX) refman.tex; \ ++ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \ + countdown=5; \ + while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ + refman.log > /dev/null 2>&1 \ + && test $$countdown -gt 0; do \ +- $(DX_PDFLATEX) refman.tex; \ ++ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \ + countdown=`expr $$countdown - 1`; \ + done; \ + mv refman.pdf ../@PACKAGE@.pdf diff --git a/activemq-cpp-openssl1.patch b/activemq-cpp-openssl1.patch new file mode 100644 index 0000000..5aa216c --- /dev/null +++ b/activemq-cpp-openssl1.patch @@ -0,0 +1,18 @@ +--- activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 2017-10-24 09:21:39.284236953 +0100 ++++ activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 2017-10-24 09:24:46.925846965 +0100 +@@ -664,11 +664,12 @@ + break; + } + +- const unsigned char* data = extension->value->data; ++ const unsigned char* data = ASN1_STRING_data(X509_EXTENSION_get_data(extension)); ++ const size_t length = ASN1_STRING_length(X509_EXTENSION_get_data(extension)); + STACK_OF(CONF_VALUE)* confValue = method->i2v(method, + method->it ? +- ASN1_item_d2i(NULL, &data, extension->value->length, ASN1_ITEM_ptr(method->it)) : +- method->d2i(NULL, &data, extension->value->length), NULL); ++ ASN1_item_d2i(NULL, &data, length, ASN1_ITEM_ptr(method->it)) : ++ method->d2i(NULL, &data, length), NULL); + + CONF_VALUE* value = NULL; + diff --git a/activemq-cpp.spec b/activemq-cpp.spec new file mode 100644 index 0000000..a594d72 --- /dev/null +++ b/activemq-cpp.spec @@ -0,0 +1,257 @@ +%global with_docs 0 + +Name: activemq-cpp +Version: 3.9.4 +Release: 4%{?dist} +Summary: C++ implementation of JMS-like messaging client + +License: ASL 2.0 +URL: http://activemq.apache.org/cms/ +Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{version}/activemq-cpp-library-%{version}-src.tar.gz +Patch0: activemq-cpp-3.8.2-system-zlib.patch +# Some local texmf configuration to increase default pool_size. +Patch1: activemq-cpp-local-texmf.patch +# Openssl 1.1.0 +# http://activemq.2283324.n4.nabble.com/activemq-cpp-3-9-4-fails-to-build-fedora-rawhide-openssl-1-1-0e-related-td4724037.html +Patch2: activemq-cpp-openssl1.patch + +BuildRequires: gcc +BuildRequires: openssl-devel +BuildRequires: zlib-devel +%if %{?with_docs}0 +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: tex(latex) +%endif +BuildRequires: apr-util-devel >= 1.3 +BuildRequires: cppunit-devel >= 1.10.2 +BuildRequires: libuuid-devel + +%description +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make your +C++ client code much neater and easier to follow. To get a better feel for +CMS try the API Reference. +ActiveMQ-CPP is a client only library, a message broker such as Apache +ActiveMQ is still needed for your clients to communicate. + +%package devel +Summary: C++ implementation header files for JMS-like messaging +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 +Requires: libuuid-devel +%else +Requires: e2fsprogs-devel +%endif + +%description devel +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make +your C++ client code much neater and easier to follow. To get a better +feel for CMS try the API Reference. ActiveMQ-CPP is a client only +library, a message broker such as Apache ActiveMQ is still needed +for your clients to communicate. + +%{name}-devel contains development header files. + +%if %{?with_docs}0 +%package doc +Summary: C++ implementation header files for JMS-like messaging +%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 +BuildArch: noarch +%endif + +%description doc +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make +your C++ client code much neater and easier to follow. To get a better +feel for CMS try the API Reference. ActiveMQ-CPP is a client only +library, a message broker such as Apache ActiveMQ is still needed +for your clients to communicate. + +%{name}-doc contains api documentation. +%endif + +%prep +%setup -q -n activemq-cpp-library-%{version} +%patch0 -p1 +rm -r src/main/decaf/internal/util/zip +%if %{?with_docs}0 +%patch1 -p1 +%endif +%patch2 -p1 +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp + + +%build +# Build pdf(30MB) rather than default html(400MB). +%if %{?with_docs}0 +%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +%else +%configure --disable-static +%endif + +make %{?_smp_mflags} +%if %{?with_docs}0 +make %{?_smp_mflags} doxygen-run +cp -p texmf.cnf doc/latex/texmf.cnf +make %{?_smp_mflags} doxygen-pdf +%endif + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example + +%check +make %{?_smp_mflags} check + +%ldconfig_scriptlets + +%files +%{_libdir}/lib%{name}.so.* +%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt + +%files devel +%{_libdir}/lib%{name}.so +%{_includedir}/%{name}-%{version} +%{_libdir}/pkgconfig/%{name}.pc +%{_bindir}/activemqcpp-config + +%if %{?with_docs}0 +%files doc +%doc doc/%{name}.pdf +%endif + +%changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.9.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 3.9.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 3.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Apr 13 2018 Steve Traylen - 3.9.4-1 +- New from upstream +- Add patch for openssl1 + +* Wed Feb 07 2018 Fedora Release Engineering - 3.8.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 3.8.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.8.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.8.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 3.8.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 3.8.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 3.8.4-2 +- Rebuilt for GCC 5 C++11 ABI change + +* Wed Mar 11 2015 Steve Traylen - 3.8.4-1 +- Upstream to 3.8.4 + +* Wed Aug 27 2014 Steve Traylen - 3.8.3-1 +- Upstream to 3.8.3 + +* Fri Aug 15 2014 Fedora Release Engineering - 3.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 3.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Ville Skyttä - 3.8.2-2 +- Patch to use system zlib instead of bundled one + +* Thu Jan 23 2014 Steve Traylen - 3.8.2-1 +- Upstream to 3.8.2 + +* Wed Sep 4 2013 Steve Traylen - 3.7.1-1 +- Upstream to 3.7.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 3.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 3.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Sep 16 2012 Steve Traylen - 3.4.4-1 +- Upstream to 3.4.4 + +* Wed Jul 18 2012 Fedora Release Engineering - 3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 3.4.1-2 +- Rebuilt for c++ ABI breakage + +* Sun Feb 12 2012 Steve Traylen - 3.4.1-1 +- Upstream to 3.4.1 +- Add patch for gcc47, AMQCPP-389 + +* Thu Jan 12 2012 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Jul 10 2011 Steve Traylen - 3.4.0-1 +- Upstream to 3.4.0 + +* Mon Apr 18 2011 Steve Traylen - 3.3.0-1 +- Upstream to 3.3.0 + +* Mon Mar 7 2011 Steve Traylen - 3.2.5-1 +- autoconf step removed. +- Upstream to 3.2.5 + +* Mon Feb 07 2011 Fedora Release Engineering - 3.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Feb 6 2011 Steve Traylen - 3.2.4-1 +- Upstream to 3.2.4 + +* Wed Nov 10 2010 Steve Traylen - 3.2.3-1 +- Upstream to 3.2.3 + +* Thu Jul 22 2010 Steve Traylen - 3.2.1-1 +- Upstream to 3.2.1 +- Add BR of openssl-devel since library now supports ssl + connections. + +* Sat Apr 3 2010 Steve Traylen - 3.1.2-1 +- Upstream to 3.1.2 + +* Sat Jan 9 2010 Steve Traylen - 3.1.0-1 +- Upstream to 3.1.0 + +* Fri Dec 11 2009 Steve Traylen - 3.0.1-1 +- Upstream to 3.0.1 +- Tar ball name change. + +* Fri Dec 11 2009 Steve Traylen - 2.2.6-5 +- Add libuuid-devel as Requires to -devel package. + +* Sat Nov 14 2009 Steve Traylen - 2.2.6-4 +- Remove patch to relocate headers from versioned directory. +- Add make smp options to make check. + +* Fri Nov 6 2009 Steve Traylen - 2.2.6-3 +- Relocate headers to non versioned directory with patch0 + +* Fri Nov 6 2009 Steve Traylen - 2.2.6-2 +- Adapted to Fedora guidelines. + +* Thu Feb 26 2009 Ricardo Rocha - 2.2.6-1 +- First version of the spec file + + diff --git a/dead.package b/dead.package deleted file mode 100644 index e568e92..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -activemq-cpp fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674632 diff --git a/sources b/sources new file mode 100644 index 0000000..1262ac0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (activemq-cpp-library-3.9.4-src.tar.gz) = 58b71acba98034578819ea0b63ca6d90168d6231e24a1d9d6a42d54ca7b7be5cf6eb82054c50ea4c3f29a2f0155433f2886226e4910ed8621474bd1315050f13 From bce6bced2e2689caf011928308d7c06b883771f0 Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Sat, 13 Apr 2024 14:48:48 -0500 Subject: [PATCH 17/21] unretire package --- .gitignore | 1 + activemq-cpp-gcc47.patch | 12 ---- activemq-cpp-local-texmf.patch | 24 ------- activemq-cpp-openssl1.patch | 18 ------ activemq-cpp.spec | 112 +++++++++++---------------------- sources | 2 +- 6 files changed, 37 insertions(+), 132 deletions(-) delete mode 100644 activemq-cpp-gcc47.patch delete mode 100644 activemq-cpp-local-texmf.patch delete mode 100644 activemq-cpp-openssl1.patch diff --git a/.gitignore b/.gitignore index 0f71b60..114e7c8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.8.3-src.tar.gz /activemq-cpp-library-3.8.4-src.tar.gz /activemq-cpp-library-3.9.4-src.tar.gz +/activemq-cpp-library-3.9.5-src.tar.gz diff --git a/activemq-cpp-gcc47.patch b/activemq-cpp-gcc47.patch deleted file mode 100644 index 2e5c962..0000000 --- a/activemq-cpp-gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h ---- activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:37:49.536000023 +0100 -+++ activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:38:56.722000023 +0100 -@@ -60,7 +60,7 @@ - */ - virtual bool add( const E& value ) { - -- if( offer( value ) ) { -+ if( this->offer( value ) ) { - return true; - } - diff --git a/activemq-cpp-local-texmf.patch b/activemq-cpp-local-texmf.patch deleted file mode 100644 index 8989a32..0000000 --- a/activemq-cpp-local-texmf.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr activemq-cpp-2.2.6.ORIG/texmf.cnf activemq-cpp-2.2.6/texmf.cnf ---- activemq-cpp-2.2.6.ORIG/texmf.cnf 1970-01-01 01:00:00.000000000 +0100 -+++ activemq-cpp-2.2.6/texmf.cnf 2009-11-07 20:47:00.466113909 +0100 -@@ -0,0 +1,2 @@ -+pool_size = 4000000 -+ -diff -uNr activemq-cpp-2.2.6.ORIG/doxygen-include.am activemq-cpp-2.2.6/doxygen-include.am ---- activemq-cpp-2.2.6.ORIG/doxygen-include.am 2009-01-23 14:56:26.000000000 +0100 -+++ activemq-cpp-2.2.6/doxygen-include.am 2009-11-07 20:52:10.558509912 +0100 -@@ -153,12 +153,12 @@ - rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ - $(DX_PDFLATEX) refman.tex; \ - $(DX_MAKEINDEX) refman.idx; \ -- $(DX_PDFLATEX) refman.tex; \ -+ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \ - countdown=5; \ - while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ - refman.log > /dev/null 2>&1 \ - && test $$countdown -gt 0; do \ -- $(DX_PDFLATEX) refman.tex; \ -+ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \ - countdown=`expr $$countdown - 1`; \ - done; \ - mv refman.pdf ../@PACKAGE@.pdf diff --git a/activemq-cpp-openssl1.patch b/activemq-cpp-openssl1.patch deleted file mode 100644 index 5aa216c..0000000 --- a/activemq-cpp-openssl1.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 2017-10-24 09:21:39.284236953 +0100 -+++ activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 2017-10-24 09:24:46.925846965 +0100 -@@ -664,11 +664,12 @@ - break; - } - -- const unsigned char* data = extension->value->data; -+ const unsigned char* data = ASN1_STRING_data(X509_EXTENSION_get_data(extension)); -+ const size_t length = ASN1_STRING_length(X509_EXTENSION_get_data(extension)); - STACK_OF(CONF_VALUE)* confValue = method->i2v(method, - method->it ? -- ASN1_item_d2i(NULL, &data, extension->value->length, ASN1_ITEM_ptr(method->it)) : -- method->d2i(NULL, &data, extension->value->length), NULL); -+ ASN1_item_d2i(NULL, &data, length, ASN1_ITEM_ptr(method->it)) : -+ method->d2i(NULL, &data, length), NULL); - - CONF_VALUE* value = NULL; - diff --git a/activemq-cpp.spec b/activemq-cpp.spec index a594d72..a5c4a56 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,119 +1,76 @@ -%global with_docs 0 - Name: activemq-cpp -Version: 3.9.4 -Release: 4%{?dist} +Version: 3.9.5 +Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client -License: ASL 2.0 +License: Apache-2.0 URL: http://activemq.apache.org/cms/ Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{version}/activemq-cpp-library-%{version}-src.tar.gz -Patch0: activemq-cpp-3.8.2-system-zlib.patch -# Some local texmf configuration to increase default pool_size. -Patch1: activemq-cpp-local-texmf.patch -# Openssl 1.1.0 -# http://activemq.2283324.n4.nabble.com/activemq-cpp-3-9-4-fails-to-build-fedora-rawhide-openssl-1-1-0e-related-td4724037.html -Patch2: activemq-cpp-openssl1.patch +Patch: activemq-cpp-3.8.2-system-zlib.patch BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: openssl-devel BuildRequires: zlib-devel -%if %{?with_docs}0 -BuildRequires: doxygen -BuildRequires: graphviz -BuildRequires: tex(latex) -%endif BuildRequires: apr-util-devel >= 1.3 BuildRequires: cppunit-devel >= 1.10.2 BuildRequires: libuuid-devel %description -activemq-cpp is a JMS-like API for C++ for interfacing with Message -Brokers such as Apache ActiveMQ. C++ messaging service helps to make your -C++ client code much neater and easier to follow. To get a better feel for -CMS try the API Reference. -ActiveMQ-CPP is a client only library, a message broker such as Apache -ActiveMQ is still needed for your clients to communicate. +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make your +C++ client code much neater and easier to follow. To get a better feel for +CMS try the API Reference. +ActiveMQ-CPP is a client only library, a message broker such as Apache +ActiveMQ is still needed for your clients to communicate. %package devel Summary: C++ implementation header files for JMS-like messaging Requires: %{name} = %{version}-%{release} Requires: pkgconfig -%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 -Requires: libuuid-devel -%else -Requires: e2fsprogs-devel -%endif +Requires: libuuid-devel %description devel -activemq-cpp is a JMS-like API for C++ for interfacing with Message -Brokers such as Apache ActiveMQ. C++ messaging service helps to make +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make your C++ client code much neater and easier to follow. To get a better -feel for CMS try the API Reference. ActiveMQ-CPP is a client only -library, a message broker such as Apache ActiveMQ is still needed -for your clients to communicate. +feel for CMS try the API Reference. ActiveMQ-CPP is a client only +library, a message broker such as Apache ActiveMQ is still needed +for your clients to communicate. %{name}-devel contains development header files. -%if %{?with_docs}0 -%package doc -Summary: C++ implementation header files for JMS-like messaging -%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 -BuildArch: noarch -%endif - -%description doc -activemq-cpp is a JMS-like API for C++ for interfacing with Message -Brokers such as Apache ActiveMQ. C++ messaging service helps to make -your C++ client code much neater and easier to follow. To get a better -feel for CMS try the API Reference. ActiveMQ-CPP is a client only -library, a message broker such as Apache ActiveMQ is still needed -for your clients to communicate. - -%{name}-doc contains api documentation. -%endif %prep -%setup -q -n activemq-cpp-library-%{version} -%patch0 -p1 +%autosetup -n activemq-cpp-library-%{version} -p1 rm -r src/main/decaf/internal/util/zip -%if %{?with_docs}0 -%patch1 -p1 -%endif -%patch2 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp +%configure --disable-static + %build -# Build pdf(30MB) rather than default html(400MB). -%if %{?with_docs}0 -%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf -%else -%configure --disable-static -%endif +%make_build -make %{?_smp_mflags} -%if %{?with_docs}0 -make %{?_smp_mflags} doxygen-run -cp -p texmf.cnf doc/latex/texmf.cnf -make %{?_smp_mflags} doxygen-pdf -%endif %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la -rm $RPM_BUILD_ROOT/%{_bindir}/example +%make_install +rm %{buildroot}%{_libdir}/lib%{name}.la +rm %{buildroot}%{_bindir}/example + %check -make %{?_smp_mflags} check +make check %ldconfig_scriptlets + %files %{_libdir}/lib%{name}.so.* -%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt +%license LICENSE.txt +%doc NOTICE.txt README.txt RELEASE_NOTES.txt + %files devel %{_libdir}/lib%{name}.so @@ -121,12 +78,13 @@ make %{?_smp_mflags} check %{_libdir}/pkgconfig/%{name}.pc %{_bindir}/activemqcpp-config -%if %{?with_docs}0 -%files doc -%doc doc/%{name}.pdf -%endif %changelog +* Wed Apr 03 2024 Jonathan Wright - 3.9.5-1 +- Unorphan package +- Update to 3.9.5 +- Overhaul spec file + * Wed Jul 24 2019 Fedora Release Engineering - 3.9.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 1262ac0..fc0102a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (activemq-cpp-library-3.9.4-src.tar.gz) = 58b71acba98034578819ea0b63ca6d90168d6231e24a1d9d6a42d54ca7b7be5cf6eb82054c50ea4c3f29a2f0155433f2886226e4910ed8621474bd1315050f13 +SHA512 (activemq-cpp-library-3.9.5-src.tar.gz) = 6481974f079b63f78fa9988726a544e86206c535066621068dae4e0856316219f92f4ead032431fa3d11a90e496e6d23b7f0f0183e44b4f51d47a98c82dc9078 From a980978eb37137c2b08eeb3e083c4c6676ef8267 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:34:25 +0000 Subject: [PATCH 18/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index a5c4a56..585ad03 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp Version: 3.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ implementation of JMS-like messaging client License: Apache-2.0 @@ -80,6 +80,9 @@ make check %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Apr 03 2024 Jonathan Wright - 3.9.5-1 - Unorphan package - Update to 3.9.5 From 7ad15d2eec108de95d58fe1dd509cc63a4c70f51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:33:03 +0000 Subject: [PATCH 19/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 585ad03..25fdbea 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp Version: 3.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ implementation of JMS-like messaging client License: Apache-2.0 @@ -80,6 +80,9 @@ make check %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 3.9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 39141c2641218616d5acb92e22982db12298177c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:44:24 +0000 Subject: [PATCH 20/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 25fdbea..d29b58a 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp Version: 3.9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ implementation of JMS-like messaging client License: Apache-2.0 @@ -80,6 +80,9 @@ make check %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.9.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 3.9.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9ea32bc98b9e80a5036cb9942dbb1cd1c90e08a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:25:49 +0000 Subject: [PATCH 21/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index d29b58a..d8d7cec 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp Version: 3.9.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ implementation of JMS-like messaging client License: Apache-2.0 @@ -80,6 +80,9 @@ make check %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 3.9.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 3.9.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild