diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index be468d1..58e7955 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,3 @@ corosync-1.2.7.tar.gz /corosync-3.1.5.tar.gz /corosync-3.1.6.tar.gz /corosync-3.1.7.tar.gz -/corosync-3.1.8.tar.gz -/corosync-3.1.9.tar.gz -/corosync-3.1.10.tar.gz diff --git a/corosync.spec b/corosync.spec index 6e04bf1..e6d4130 100644 --- a/corosync.spec +++ b/corosync.spec @@ -12,13 +12,16 @@ %bcond_without runautogen %bcond_without userflags +%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}} +%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} + Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.10 -Release: 1%{?dist} -License: BSD-3-Clause +Version: 3.1.7 +Release: 1%{?gitver}%{?dist} +License: BSD URL: http://corosync.github.io/corosync/ -Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz # Runtime bits # The automatic dependency overridden in favor of explicit version lock @@ -65,10 +68,9 @@ Requires: libxslt BuildRequires: readline-devel %endif BuildRequires: make -BuildRequires: git %prep -%autosetup -S git_am +%setup -q -n %{name}-%{version}%{?gittarver} %build %if %{with runautogen} @@ -114,7 +116,7 @@ BuildRequires: git %if %{with dbus} mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d -install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_datadir}/dbus-1/system.d/corosync-signals.conf +install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf %endif ## tree fixup @@ -183,7 +185,7 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/corosync %config(noreplace) %{_sysconfdir}/logrotate.d/corosync %if %{with dbus} -%{_datadir}/dbus-1/system.d/corosync-signals.conf +%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf %endif %if %{with snmp} %{_datadir}/snmp/mibs/COROSYNC-MIB.txt @@ -195,10 +197,8 @@ fi %{_initrddir}/corosync %{_initrddir}/corosync-notifyd %endif -%if %{without systemd} %dir %{_localstatedir}/lib/corosync %dir %{_localstatedir}/log/cluster -%endif %{_mandir}/man7/corosync_overview.7* %{_mandir}/man8/corosync.8* %{_mandir}/man8/corosync-blackbox.8* @@ -289,53 +289,9 @@ network splits) %endif %changelog -* Sat Nov 15 2025 Jan Friesse - 3.1.10-1 -- New upstream release - -* Wed Jul 23 2025 Fedora Release Engineering - 3.1.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 16 2025 Jan Friesse - 3.1.9-4 -- exec: Add support for env STATE_DIRECTORY -- init: Use LogsDirectory in systemd unit file - -* Wed Mar 26 2025 Jan Friesse - 3.1.9-3 -- totemsrp: Check size of orf_token msg - (fixes CVE-2025-30472) - -* Thu Jan 16 2025 Fedora Release Engineering - 3.1.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Nov 15 2024 Jan Friesse - 3.1.9-1 -- New upstream release - -* Wed Jul 17 2024 Fedora Release Engineering - 3.1.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 3.1.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Nov 15 2023 Jan Friesse - 3.1.8-1 -- New upstream release - -* Wed Jul 19 2023 Fedora Release Engineering - 3.1.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 06 2023 Jan Friesse - 3.1.7-3 -- migrated to SPDX license - -* Thu Jan 19 2023 Fedora Release Engineering - 3.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Tue Nov 15 2022 Jan Friesse - 3.1.7-1 - New upstream release -* Wed Jul 20 2022 Fedora Release Engineering - 3.1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - * Wed Mar 30 2022 Jan Friesse - 3.1.6-3 - Use copytruncate method for logrotate diff --git a/sources b/sources index 9c626fd..5abef83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.10.tar.gz) = cf2014d15fdbd3495cfe64629255f7855a79651a595938dac7bc7ec67338d843079ae40cf1c15de23b50d85cb39b2c2e3e3448a9cc33759ad8988b8c85ce59d3 +SHA512 (corosync-3.1.7.tar.gz) = a4d00f18a6dda07f36e77fc48f5bddff77e12a3e6ee40d9450734e281d20479b90cd0c653e255cfc46e0e42e4a0177291a3daba671e751d027e4317e601f0cd2 diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..e6c79fd --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,3 @@ +# Ignore tests runs/artefacts. +artifacts/** +**/*.retry diff --git a/tests/plan.fmf b/tests/plan.fmf deleted file mode 100644 index 1c97683..0000000 --- a/tests/plan.fmf +++ /dev/null @@ -1,12 +0,0 @@ -summary: Run all smoke tests -discover: - how: fmf -execute: - how: tmt -prepare: - how: install - package: - - gcc - - iproute - - corosync - - corosync-devel diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf deleted file mode 100644 index c431594..0000000 --- a/tests/smoke/main.fmf +++ /dev/null @@ -1,2 +0,0 @@ -summary: Basic smoke test -test: ./runtest.sh diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh old mode 100755 new mode 100644 diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..39b6209 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + tests: + - smoke + required_packages: + - gcc + - iproute + - corosync + - corosync-devel