public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Pavol Sloboda <psloboda@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/galera] f44: Rebase to 26.4.27
Date: Tue, 09 Jun 2026 18:58:19 GMT	[thread overview]
Message-ID: <178103149930.1.10592488284209290740.rpms-galera-4d06ee17b2ab@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/galera
            Branch : f44
            Commit : 4d06ee17b2ab902ad94889bcc92a26390da30101
            Author : Pavol Sloboda <psloboda@redhat.com>
            Date   : 2026-06-02T16:49:00+02:00
            Stats  : +2/-32 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/galera/c/4d06ee17b2ab902ad94889bcc92a26390da30101?branch=f44

            Log:
            Rebase to 26.4.27

removed the no-longer needed patch as it is present in the source
tarball

Release notes:
https://github.com/mariadb-corporation/mariadb-docs/blob/main/release-notes/galera-cluster/26.4/26.4.7.md

Resolves: RHBZ#2483947

---
diff --git a/galera.spec b/galera.spec
index f61de56..e318b2a 100644
--- a/galera.spec
+++ b/galera.spec
@@ -2,7 +2,7 @@
 ExcludeArch: %{ix86}
 
 Name:           galera
-Version:        26.4.26
+Version:        26.4.27
 Release:        1%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
@@ -16,7 +16,6 @@ URL:            https://mariadb.com/docs/galera-cluster
 Source0:        https://archive.mariadb.org/mariadb-11.8/%{name}-%{version}/src/%{name}-%{version}.tar.gz
 
 Patch3:         asio-1.33-compat.patch
-Patch4:         upstream_810f3589742ecb8c4f32d44c363d30488582a9f6.patch
 
 BuildRequires:  boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel
 Requires:       nmap-ncat
@@ -35,7 +34,6 @@ description of Galera replication engine see https://www.galeracluster.com web.
 %prep
 %setup -q
 %patch -P3 -p1
-%patch -P4 -p1
 
 # Create a sysusers.d config file
 cat >galera.sysusers.conf <<EOF

diff --git a/sources b/sources
index de71752..5ef5776 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (galera-26.4.26.tar.gz) = 6cca23da2a449f9a8e2ced963559abe0aab79cdeebee475478c0e18d5ad1ddfc184367d518cad555998921bb67bcf9494fa30ae9fff6ce4b2b251668672483e7
+SHA512 (galera-26.4.27.tar.gz) = 57325891e12a4be34fb3ed2db530debce51ab8ebf33ab423fde129a3bd6e40a2cc36ad67915727a5d8041dee5e0f6b5d7bc29dbcefe4666f80a589289f4543f7

diff --git a/upstream_810f3589742ecb8c4f32d44c363d30488582a9f6.patch b/upstream_810f3589742ecb8c4f32d44c363d30488582a9f6.patch
deleted file mode 100644
index ec379ca..0000000
--- a/upstream_810f3589742ecb8c4f32d44c363d30488582a9f6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 810f3589742ecb8c4f32d44c363d30488582a9f6 Mon Sep 17 00:00:00 2001
-From: Pavol Sloboda <127213124+PavolSloboda@users.noreply.github.com>
-Date: Wed, 13 May 2026 09:16:17 +0200
-Subject: [PATCH] Added a fix when building with openssl4 by using the opaque
- (#55)
-
-implementation of the X509_name_st struct as X509_NAME
-which was introduced in openssl-1.1.0 as can be seen here:
-https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes
-this means that the fix is applicable in openssl versions older than 4.0
-as well and won't break anything
----
- galerautils/tests/gu_asio_test.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/galerautils/tests/gu_asio_test.cpp b/galerautils/tests/gu_asio_test.cpp
-index a16a08e75..d9c30d861 100644
---- a/galerautils/tests/gu_asio_test.cpp
-+++ b/galerautils/tests/gu_asio_test.cpp
-@@ -1235,7 +1235,7 @@ static X509* create_x509(EVP_PKEY* pkey, X509* issuer, const char* cn,
-     X509_gmtime_adj(X509_get_notAfter(x509), 31536000L);
-     X509_set_pubkey(x509, pkey);
- 
--    auto* name = X509_get_subject_name(x509);
-+    X509_NAME* name = (X509_NAME*)X509_get_subject_name(x509);
-     static const unsigned char C_str [] = "FI";
-     static const unsigned char ST_str[] = "Uusimaa";
-     static const unsigned char L_str [] = "Helsinki";

                 reply	other threads:[~2026-06-09 18:58 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178103149930.1.10592488284209290740.rpms-galera-4d06ee17b2ab@fedoraproject.org \
    --to=psloboda@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox