Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mariadb for openSUSE:Factory checked
in at 2025-04-16 20:38:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb (Old)
and /work/SRC/openSUSE:Factory/.mariadb.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb"
Wed Apr 16 20:38:01 2025 rev:146 rq:1269721 version:11.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2025-02-20
16:30:06.784267527 +0100
+++ /work/SRC/openSUSE:Factory/.mariadb.new.30101/mariadb.changes
2025-04-20 20:03:27.949804283 +0200
@@ -1,0 +2,12 @@
+Tue Apr 15 05:59:24 UTC 2025 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- fix build with pcre2 10.45 boo#1241198, adding
+ mariadb-11.7.2-MDEV-36078-PCRE2-10.45-breaks-main.func_regexp_pcre-.patch
+ based on upstream
+
+-------------------------------------------------------------------
+Fri Apr 4 19:02:40 UTC 2025 - Andreas Schwab <sch...@suse.de>
+
+- Update constraints for riscv64
+
+-------------------------------------------------------------------
New:
----
mariadb-11.7.2-MDEV-36078-PCRE2-10.45-breaks-main.func_regexp_pcre-.patch
BETA DEBUG BEGIN:
New:- fix build with pcre2 10.45 boo#1241198, adding
mariadb-11.7.2-MDEV-36078-PCRE2-10.45-breaks-main.func_regexp_pcre-.patch
based on upstream
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb.spec ++++++
--- /var/tmp/diff_new_pack.R8wBzu/_old 2025-04-20 20:03:29.189858932 +0200
+++ /var/tmp/diff_new_pack.R8wBzu/_new 2025-04-20 20:03:29.193859109 +0200
@@ -81,6 +81,7 @@
Patch10: fix-pamdir.patch
Patch11: gcc13-fix.patch
Patch12: mariadb-fix-testsuite-openssl3.2.3.patch
+Patch13:
mariadb-11.7.2-MDEV-36078-PCRE2-10.45-breaks-main.func_regexp_pcre-.patch
# needed for bison SQL parser and wsrep API
BuildRequires: bison
BuildRequires: cmake
@@ -364,6 +365,7 @@
%endif
%patch -P 11 -p1
%patch -P 12 -p1
+%patch -P 13 -p1
cp %{_sourcedir}/suse-test-run .
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.R8wBzu/_old 2025-04-20 20:03:29.257861929 +0200
+++ /var/tmp/diff_new_pack.R8wBzu/_new 2025-04-20 20:03:29.261862106 +0200
@@ -33,5 +33,16 @@
</physicalmemory>
</hardware>
</overwrite>
+
+ <overwrite>
+ <conditions>
+ <arch>riscv64</arch>
+ </conditions>
+ <hardware>
+ <disk>
+ <size unit="G">23</size>
+ </disk>
+ </hardware>
+ </overwrite>
</constraints>
++++++
mariadb-11.7.2-MDEV-36078-PCRE2-10.45-breaks-main.func_regexp_pcre-.patch ++++++
>From bc13c8e4ae3cf8335f569dc0cff11d655e136f86 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <s...@mariadb.org>
Date: Wed, 26 Mar 2025 12:32:34 +0100
Subject: [PATCH] MDEV-36078 PCRE2 10.45 breaks main.func_regexp_pcre due to
change in PCRE
10.45 is correct, update test results to match.
allow builds with <10.45 too (for old distros) but remove the buggy test
---
cmake/pcre.cmake | 4 ++--
mysql-test/main/func_regexp_pcre.result | 28 +------------------------
mysql-test/main/func_regexp_pcre.test | 2 +-
3 files changed, 4 insertions(+), 30 deletions(-)
Index: mariadb-11.7.2/cmake/pcre.cmake
===================================================================
--- mariadb-11.7.2.orig/cmake/pcre.cmake
+++ mariadb-11.7.2/cmake/pcre.cmake
@@ -57,8 +57,8 @@ MACRO(BUNDLE_PCRE2)
ExternalProject_Add(
pcre2
PREFIX "${dir}"
- URL
"https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.44/pcre2-10.44.zip";
- URL_MD5 dfab8313154b3377a6959c3b6377841e
+ URL
"https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.45/pcre2-10.45.zip";
+ URL_MD5 873da56c6469ec207ca5c5ae9688b83a
INSTALL_COMMAND ""
CMAKE_ARGS
"-DCMAKE_WARN_DEPRECATED=FALSE"
Index: mariadb-11.7.2/mysql-test/main/func_regexp_pcre.result
===================================================================
--- mariadb-11.7.2.orig/mysql-test/main/func_regexp_pcre.result
+++ mariadb-11.7.2/mysql-test/main/func_regexp_pcre.result
@@ -60,7 +60,7 @@ INSERT INTO t1 VALUES ('1'),('௨');
INSERT INTO t2 VALUES ('\\p{Cyrillic}'),('\\p{Greek}'),('\\p{Latin}');
INSERT INTO t2 VALUES ('\\p{Han}'),('\\p{Hangul}');
INSERT INTO t2 VALUES ('\\p{Sinhala}'), ('\\p{Tamil}');
-INSERT INTO t2 VALUES ('\\p{L}'),('\\p{Ll}'),('\\p{Lu}'),('\\p{L&}');
+INSERT INTO t2 VALUES ('\\p{L}'), /* buggy before v10.45
('\\p{Ll}'),('\\p{Lu}'),*/ ('\\p{L&}');
INSERT INTO t2 VALUES ('[[:alpha:]]'),('[[:digit:]]');
SELECT class, ch, ch RLIKE class FROM t1, t2 ORDER BY BINARY class, BINARY ch;
class ch ch RLIKE class
@@ -168,32 +168,6 @@ class ch ch RLIKE class
\p{Latin} ප 0
\p{Latin} ã 0
\p{Latin} ê°· 0
-\p{Ll} 1 0
-\p{Ll} A 0
-\p{Ll} a 1
-\p{Ll} Ã 0
-\p{Ll} Ã 1
-\p{Ll} Σ 0
-\p{Ll} Ï 1
-\p{Ll} Я 0
-\p{Ll} Ñ 1
-\p{Ll} ௨ 0
-\p{Ll} ප 0
-\p{Ll} ã 0
-\p{Ll} ê°· 0
-\p{Lu} 1 0
-\p{Lu} A 1
-\p{Lu} a 0
-\p{Lu} Ã 1
-\p{Lu} Ã 0
-\p{Lu} Σ 1
-\p{Lu} Ï 0
-\p{Lu} Я 1
-\p{Lu} Ñ 0
-\p{Lu} ௨ 0
-\p{Lu} ප 0
-\p{Lu} ã 0
-\p{Lu} ê°· 0
\p{L} 1 0
\p{L} A 1
\p{L} a 1
Index: mariadb-11.7.2/mysql-test/main/func_regexp_pcre.test
===================================================================
--- mariadb-11.7.2.orig/mysql-test/main/func_regexp_pcre.test
+++ mariadb-11.7.2/mysql-test/main/func_regexp_pcre.test
@@ -41,7 +41,7 @@ INSERT INTO t1 VALUES ('1'),('௨');
INSERT INTO t2 VALUES ('\\p{Cyrillic}'),('\\p{Greek}'),('\\p{Latin}');
INSERT INTO t2 VALUES ('\\p{Han}'),('\\p{Hangul}');
INSERT INTO t2 VALUES ('\\p{Sinhala}'), ('\\p{Tamil}');
-INSERT INTO t2 VALUES ('\\p{L}'),('\\p{Ll}'),('\\p{Lu}'),('\\p{L&}');
+INSERT INTO t2 VALUES ('\\p{L}'), /* buggy before v10.45
('\\p{Ll}'),('\\p{Lu}'),*/ ('\\p{L&}');
INSERT INTO t2 VALUES ('[[:alpha:]]'),('[[:digit:]]');
# Use "ORDER BY BINARY" to avoid dependency on the default utf8 collation
SELECT class, ch, ch RLIKE class FROM t1, t2 ORDER BY BINARY class, BINARY ch;
