From 35f42527e69e9022a5c1f2e3d199277b0e4b72a7 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Mon, 30 Mar 2026 10:21:34 -0400
Subject: [PATCH] import CS corosync-3.1.10-1.el9

---
 .corosync.metadata  |  2 +-
 .gitignore          |  2 +-
 SPECS/corosync.spec | 28 +++++++++++++++++++---------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.corosync.metadata b/.corosync.metadata
index a24e47d..dfd7563 100644
--- a/.corosync.metadata
+++ b/.corosync.metadata
@@ -1 +1 @@
-2ceb27fe91b45d64eabbfec59ae1937e71697296 SOURCES/corosync-3.1.9.tar.gz
+42c2e9d62f30c933768b5430e0a8165f07889301 SOURCES/corosync-3.1.10.tar.gz
diff --git a/.gitignore b/.gitignore
index 01f2ef1..8a476e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/corosync-3.1.9.tar.gz
+SOURCES/corosync-3.1.10.tar.gz
diff --git a/SPECS/corosync.spec b/SPECS/corosync.spec
index c727ee0..01c9683 100644
--- a/SPECS/corosync.spec
+++ b/SPECS/corosync.spec
@@ -12,16 +12,13 @@
 %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.9
-Release: 1%{?gitver}%{?dist}
-License: BSD
+Version: 3.1.10
+Release: 1%{?dist}
+License: BSD-3-Clause
 URL: http://corosync.github.io/corosync/
-Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz
+Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}%{?gittarver}.tar.gz
 
 # Runtime bits
 # The automatic dependency overridden in favor of explicit version lock
@@ -68,9 +65,10 @@ Requires: libxslt
 BuildRequires: readline-devel
 %endif
 BuildRequires: make
+BuildRequires: git
 
 %prep
-%setup -q -n %{name}-%{version}%{?gittarver}
+%autosetup -S git_am
 
 %build
 %if %{with runautogen}
@@ -116,7 +114,7 @@ BuildRequires: make
 
 %if %{with dbus}
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
-install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_datadir}/dbus-1/system.d/corosync-signals.conf
+install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_datadir}/dbus-1/system.d/corosync-signals.conf
 %endif
 
 ## tree fixup
@@ -197,8 +195,10 @@ 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,6 +289,16 @@ network splits)
 %endif
 
 %changelog
+* Tue Nov 18 2025 Jan Friesse <jfriesse@redhat.com> - 3.1.10-1
+- Resolves: RHEL-122942
+
+- New upstream release (RHEL-122942)
+
+* Wed Mar 26 2025 Jan Friesse <jfriesse@redhat.com> - 3.1.9-2
+- Resolves: RHEL-84616
+
+- totemsrp: Check size of orf_token msg (fixes CVE-2025-30472)
+
 * Fri Nov 15 2024 Jan Friesse <jfriesse@redhat.com> - 3.1.9-1
 - Resolves: RHEL-65699