diff --git a/DBD-MariaDB-1.23-Note-about-mariadb-connector-c.patch b/DBD-MariaDB-1.23-Note-about-mariadb-connector-c.patch deleted file mode 100644 index 398f9bc..0000000 --- a/DBD-MariaDB-1.23-Note-about-mariadb-connector-c.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up DBD-MariaDB-1.23/lib/DBD/MariaDB.pod.orig DBD-MariaDB-1.23/lib/DBD/MariaDB.pod ---- DBD-MariaDB-1.23/lib/DBD/MariaDB.pod.orig 2025-02-04 09:17:49.438216175 +0100 -+++ DBD-MariaDB-1.23/lib/DBD/MariaDB.pod 2025-02-04 09:21:25.530382547 +0100 -@@ -281,6 +281,12 @@ L|/mariadb_ssl_ca - - This means that your communication with the server will be encrypted. - -+NOTE: Due to the changes in mariadb-connector-c 3.4.0, SSL is always -+enforced on MariaDB and this option does not have any effect (that does not -+apply when connecting to MySQL though). You will need MariaDB with enabled -+SSL support on server side, otherwise you'll get TLS/SSL error. That might -+change in a future release. -+ - =item mariadb_ssl_ca_file - - The path to a file in PEM format that contains a list of trusted SSL certificate diff --git a/perl-DBD-MariaDB.spec b/perl-DBD-MariaDB.spec index a1f60f1..f4d3d0f 100644 --- a/perl-DBD-MariaDB.spec +++ b/perl-DBD-MariaDB.spec @@ -9,7 +9,7 @@ Name: perl-DBD-MariaDB Version: 1.23 -Release: 9%{?dist} +Release: 10%{?dist} Summary: MariaDB and MySQL driver for the Perl5 Database Interface (DBI) License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/DBD-MariaDB/ @@ -18,8 +18,6 @@ Source1: test-setup.t Source2: test-clean.t Source3: test-env.sh Patch0: DBD-MariaDB-1.21-Run-test-setup-and-clean.patch -# Note about changes in mariadb-connector-c which affected SSL connection -Patch1: DBD-MariaDB-1.23-Note-about-mariadb-connector-c.patch BuildRequires: findutils BuildRequires: gcc BuildRequires: make @@ -108,7 +106,6 @@ with "%{_libexecdir}/%{name}/test". %prep %setup -q -n DBD-MariaDB-%{version} %patch -P0 -p1 -%patch -P1 -p1 cp %{SOURCE1} %{SOURCE2} t/ # Create certificates for tests @@ -189,6 +186,10 @@ make test %{?with_perl_DBD_MariaDB_enables_leak_test:EXTENDED_TESTING=1} %{_libexecdir}/%{name} %changelog +* Wed Feb 05 2025 Jitka Plesnikova - 1.23-10 +- Resolves: RHEL-66250 +- Remove notes about mariadb-connector-c and SSL + * Tue Feb 04 2025 Jitka Plesnikova - 1.23-9 - Resolves: RHEL-66250 - Updated notes related to the issue