diff --git a/.gitignore b/.gitignore index 34fa1a0..0504cda 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,6 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.2306.0.tar.gz /rsyslog-8.2308.0.tar.gz /rsyslog-doc-8.2308.0.tar.gz +/qpid-proton-0.39.0.tar.gz +/rsyslog-8.2310.0.tar.gz +/rsyslog-doc-8.2310.0.tar.gz diff --git a/rsyslog.spec b/rsyslog.spec index 8126ae1..a3cf88b 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -1,6 +1,7 @@ %define rsyslog_statedir %{_sharedstatedir}/rsyslog %define rsyslog_pkidir %{_sysconfdir}/pki/rsyslog %define rsyslog_docdir %{_docdir}/rsyslog +%define qpid_proton_v 0.39.0 # The following packages are not enabled on rhel: # hiredis, libdbi, mongodb, rabbitmq # The omamqp1 plugin is built differently as qpid-proton is not available on rhel @@ -35,7 +36,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.2308.0 +Version: 8.2310.0 Release: 1%{?dist} License: GPL-3.0-or-later AND Apache-2.0 URL: http://www.rsyslog.com/ @@ -47,9 +48,7 @@ Source4: rsyslog.log Source5: rsyslog.service # Add qpid-proton as another source, enable omamqp1 module in a # separatae sub-package with it statically linked(see rhbz#1713427) -Source6: https://archive.apache.org/dist/qpid/proton/0.34.0/qpid-proton-0.34.0.tar.gz - -Patch0: openssl3-compatibility.patch +Source6: https://archive.apache.org/dist/qpid/proton/%{qpid_proton_v}/qpid-proton-%{qpid_proton_v}.tar.gz BuildRequires: make BuildRequires: gcc @@ -391,9 +390,6 @@ mv build doc %if %{with omamqp1} # Unpack qpid-proton %setup -q -D -T -b 6 -pushd .. -%patch -P 0 -p1 -b .openssl-compatibility -popd %endif %build @@ -407,7 +403,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic" %if %{with omamqp1} # build the proton first ( - cd %{_builddir}/qpid-proton-0.34.0 + cd %{_builddir}/qpid-proton-%{qpid_proton_v} mkdir bld cd bld @@ -469,7 +465,7 @@ autoreconf -if --enable-omrabbitmq \ %endif %if %{with omamqp1} - --enable-omamqp1 PROTON_LIBS="%{_builddir}/qpid-proton-0.34.0/bld/c/libqpid-proton-core-static.a %{_builddir}/qpid-proton-0.34.0/bld/c/libqpid-proton-proactor-static.a %{_builddir}/qpid-proton-0.34.0/bld/c/libqpid-proton-static.a -lssl -lsasl2 -lcrypto" PROTON_CFLAGS="-I%{_builddir}/qpid-proton-0.34.0/bld/c/include" \ + --enable-omamqp1 PROTON_LIBS="%{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-core-static.a %{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-proactor-static.a %{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-static.a -lssl -lsasl2 -lcrypto" PROTON_CFLAGS="-I%{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/include" \ %endif --enable-elasticsearch \ --enable-generate-man-pages \ @@ -770,8 +766,9 @@ done %changelog -* Fri Aug 25 2023 Attila Lakatos - 8.2308.0-1 -- Rebase to 8.2308.0 +* Fri Aug 25 2023 Attila Lakatos - 8.2310.0-1 +- Rebase to 8.2310.0 + resolves: rhbz#2232275 * Wed Aug 16 2023 Stewart Smith - 8.2306.0-4 - Add mmtaghostname module as a subpackage diff --git a/sources b/sources index e22f0fc..cb9d7c3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (qpid-proton-0.34.0.tar.gz) = 6a72540b662ac121838d8cc32b9480e948f9953f87036c3bcb72d9e77b07ea41973ccd3c2513b64c56b4f53077708a893e42e13fd5792cf8c4bcbbc4d2384e23 -SHA512 (rsyslog-8.2308.0.tar.gz) = f8bcbbfe2c5c0a7e56203fc4ff285594cfa27fa7c998db2fe065a3f06b9bc30692626787c509b1f5d081a4b176680183b651625c5e3ccb4580ac59f3980ae8a5 -SHA512 (rsyslog-doc-8.2308.0.tar.gz) = f0a581e2a7642d100cdca94125c39cf00acfc3339114ddad067d726f1526941f52ab33c0f5789f9cbd4197b3e1f3c841da86c71886fa97306990193db8d6c935 +SHA512 (qpid-proton-0.39.0.tar.gz) = df5c5469ee82ba02de62dce15b73b81aab2aae07c7db668182df690cea4ff7584111bd12143fe5e3569469a9ddf4950ac68d60b53d1a7815da4748052948cd1b +SHA512 (rsyslog-8.2310.0.tar.gz) = f04e14ede8c35e1799eadc711a6e99dbe56d312c7909c7ebed4d4bd489d310a44a5c2d3ed23968fbf3ccff5b580870d0f3ceeb690deb1d1424420fc9d3220696 +SHA512 (rsyslog-doc-8.2310.0.tar.gz) = cf452f3705680fc81495e940ea7d5ae705a6dbfe0e2ce5a87865c3043f79daaec243df20e8aadd9fac6144a3df8f19d7c56fdf19ec68df78e2fdaffa45096143