pool/mariadb
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pool:factory
Branches Tags
pool:factory
pool:devel
rpm:factory
rpm:devel
..
compare: rpm:factory
Branches Tags
rpm:factory
rpm:devel
pool:factory
pool:devel

No commits in common. "factory" and "factory" have entirely different histories.
factory ... factory

11 changed files with 57 additions and 110 deletions
Show Stats Expand all files Collapse all files

12
gcc13-fix.patch
View File

@ -58,3 +58,15 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
#include "rocksdb/rocksdb_namespace.h"
Index: mariadb-10.11.3/tpool/aio_linux.cc
===================================================================
--- mariadb-10.11.3.orig/tpool/aio_linux.cc
+++ mariadb-10.11.3/tpool/aio_linux.cc
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi
# include <cstdio>
# include <libaio.h>
# include <sys/syscall.h>
+# include <cstdio>
/**
Invoke the io_getevents() system call, without timeout parameter.

2
macros.mariadb-test
View File

@ -57,7 +57,7 @@ mysql_install_db --defaults-file=$TEST_RUN_DIR/my.cnf \
\
echo '>>> Invoking mysqld' \
/usr/sbin/mysqld --defaults-file=$TEST_RUN_DIR/my.cnf& \
sleep 10 \
sleep 2 \
\
echo ">>> Creating \'$TEST_DB\' database, (credentials: $TEST_USER, $TEST_PASS)" \
mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild password abuildpw \

3
mariadb-11.5.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e25fac00aeb34610faf62182836a14e3310c0ca5d882e9109f63bd8dfdc3542d
size 108221481

16
mariadb-11.5.2.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmaxf6gACgkQ8WVvJMdM
0diboxAA7mHaK3gKRt0Ghko+HeQqhyDovPBSaxM+Z/2SY3KxHSbkzVLnMSOVn4Wy
Jj4dHBDRTpZqBmLep5Xi0qgYRoiVaUC4hBmk4oAD7rRRLSf3LYVTHtst5HZeIRMm
XuP/+egoP/Jb6C14cZilzB7nEc31mNpCqhARShm2fQmZ+SuKBoiUrYfNKH4/fqd2
KbOCWxigitOieWKPUMk+g+qBa2ETbWOzcWvhECeavLJ+kgGIm43KRJ17lyHlBbFR
Cey/XHfVrdpCmV9uqJectnfnXTFqZ/uxINMKMyX2I53tB7oNBzGa4feOwqhlQiUd
raiaCdbit7fs1ud9yDDW41gJzopR7i/X2PRWk7w+zl8ioNiCu/KlSOs2naPeCzez
dRbNxU8Samjey8uprXMyioAsrX8gv7al/eFVqgxxCumc3nO7Umpmi2tHvWx+B98T
8HEbY7p31qCxk+fkwqcZc03g1p2XcxsfVb5jzzYxjk08g3zZAIueDab9umViIPBH
S0JYwUbm0bktUW5E3qaMEh9UA6Tu8L2b9q+eESRllYqNsB3mU5ik6gLBd8Ly5GQ4
UTKRq+oYjqZt9X7m1jQJ9IdIQtwMfxhDJa0mPvekB8abT80CuzXwStYvA9n1QMas
QgRhRpG2yoCoL/u5BwtjvyzPKYTYvC/jc8pk/A+CJCgFHTAC4o8=
=fqEG
-----END PGP SIGNATURE-----

3
mariadb-11.7.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:557a89f08e74015d1d6909595e003dca75d4df21ed1ef8180d63cdd74e5e71b3
size 112783230

16
mariadb-11.7.2.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmetLyQACgkQ8WVvJMdM
0dhSuA//XjoebXyjGHOs8YAls0PkVNWstGZqu03KcTkvBiiaGEKh4UNm85sI7u3a
aoq9obx687YIPb76vOy6FqY6mIqcknuy7X1zLKaJGBYq9uNOtfwbtZLJypkjxB31
t/YptRsjFV6YhzkWsP9Y43PVkZ4XE45ILskigoN3s6S6lRYsPn4ChtC/RtEfc2oI
trEo7g1Vj/rj8yc4pk6L5PL3VNLQbH0t/2rkoMbZnLLiKZhkOyu/XZ17DeD+MmO3
V2UwksqyKK3Emyrubic3vHDIcBuIjWqlSPwhKxnUAcWZohBrRE5LO1TL46kmlIqN
6DB2DiZUbTo/0x7LX4CJIPa+lsh8tYa/HDWa5d/PsNlh00gxYfo4lRH3V6pKotmh
68BrjebkZgqBoJLEeegd2lpjBuX0P5Gd9bU39806lJLVB7XKum6ES10kCzgMgcmV
QW4kTkFvOk9j26y5dfCIlmLYcbN2LSC3Y3Ct8MDKy0z7Zznx8CGebGDRwzoV079f
aR9popviLXFFJsbiye8MXMnu1e18UiGYzfpLZjn+PzKTC3BcvXCycS9bH59pVh6W
aamPSyM79WcJUSzlMuIRDv7vfaHjPCFIHLuHnBgJxN/nn+SZq0zMGlYaXgA4O1g5
DLDvYKxP3nN9020YuApzwAK8NJLkRiGtq6vs94IPvETuCywIMmg=
=cuiD
-----END PGP SIGNATURE-----

13
mariadb-fix-testsuite-openssl3.2.3.patch
View File

@ -1,13 +0,0 @@
Index: mariadb-11.6.1/mysql-test/main/init_connect.test
===================================================================
--- mariadb-11.6.1.orig/mysql-test/main/init_connect.test
+++ mariadb-11.6.1/mysql-test/main/init_connect.test
@@ -46,7 +46,7 @@ select @a;
# We got disconnected after receiving the above error message; any further
# requests should fail with a notice that no one's listening to us.
# --error CR_SERVER_GONE_ERROR,CR_SERVER_LOST
---error 2013,2006
+--error 2013,2006,2026
select @a;
connection con0;
drop table t1;

64
mariadb.changes
View File

@ -1,67 +1,3 @@
-------------------------------------------------------------------
Wed Feb 19 21:55:34 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update list of skipped tests
-------------------------------------------------------------------
Wed Feb 19 07:05:37 UTC 2025 - Jiri Slaby <jslaby@suse.cz>
- drop unknown options, this yields nothing in the sources:
grep -rwE 'WITH_LIBEVENT|WITH_LIBEDIT|WITH_EDITLINE|WITH_XTRADB_STORAGE_ENGINE|WITH_CSV_STORAGE_ENGINE|WITH_HANDLERSOCKET_STORAGE_ENGINE|WITH_INNODB_MEMCACHED|WITH_INNODB_DISALLOW_WRITES|WITH_LIBARCHIVE'
- set -DWITH_READLINE=OFF as it is a bool (and not =0)
- drop DEFAULT_CHARSET=utf8mb4 and
DEFAULT_COLLATION=utf8mb4_unicode_520_ci to pick up the defaults
(still utf8mb4, but utf8mb4_uca1400_ai_ci).
See https://jira.mariadb.org/browse/MDEV-36113
- add readline-devel to requires, so it is picked up (WITH_READLINE=OFF above
translates to "use lib from system"). Now we have:
CMakeCache.txt:READLINE_LIBRARY:FILEPATH=/usr/lib64/libreadline.so
-------------------------------------------------------------------
Fri Feb 14 14:41:28 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update to 11.7.2:
https://mariadb.com/kb/en/mariadb-11-7-2-release-notes/
https://mariadb.com/kb/en/mariadb-11-7-2-changelog/
* fixes for the following security vulnerabilities:
11.7.2: CVE-2025-21490
* fixes bsc#1236823
- Remove extra compiler flags. These don't seem to be needed anymore
and were overwriting predefined flags
-------------------------------------------------------------------
Tue Nov 26 19:23:02 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update to 11.6.2:
https://mariadb.com/kb/en/mariadb-11-6-2-release-notes/
https://mariadb.com/kb/en/mariadb-11-6-2-changelog/
- Update list of skipped tests
-------------------------------------------------------------------
Tue Nov 26 16:59:42 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
- Fix test for SSL connection init with openssl 3.2.3.
* Added mariadb-fix-testsuite-openssl3.2.3.patch
-------------------------------------------------------------------
Thu Nov 14 21:10:35 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update to 11.6.1:
https://mariadb.com/kb/en/mariadb-11-6-1-release-notes/
https://mariadb.com/kb/en/mariadb-11-6-1-changelog/
- Update list of skipped tests
- Refresh gcc13-fix.patch
-------------------------------------------------------------------
Mon Nov 11 10:36:05 UTC 2024 - Andreas Schwab <schwab@suse.de>
- Reduce race in %mysql_testserver_start
-------------------------------------------------------------------
Sun Sep 22 22:31:04 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
- Read defaults during mysql_upgrade to respect client configuration
-------------------------------------------------------------------
Tue Aug 20 17:00:30 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>

31
mariadb.spec
View File

@ -52,14 +52,14 @@
# Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
%define with_cracklib_plugin 0
Name: mariadb
Version: 11.7.2
Version: 11.5.2
Release: 0
Summary: Server part of MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Productivity/Databases/Servers
URL: https://www.mariadb.org
Source: https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz
Source1: https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc
Source: https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz
Source1: https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc
Source2: %{name}.keyring
Source4: README.debug
Source5: suse-test-run
@ -80,7 +80,6 @@ Patch6: mariadb-10.4.12-harden_setuid.patch
Patch7: mariadb-10.4.12-fix-install-db.patch
Patch10: fix-pamdir.patch
Patch11: gcc13-fix.patch
Patch12: mariadb-fix-testsuite-openssl3.2.3.patch
# needed for bison SQL parser and wsrep API
BuildRequires: bison
BuildRequires: cmake
@ -113,7 +112,6 @@ BuildRequires: pkgconfig
BuildRequires: procps
# Some tests and myrocks_hotbackup script need python3
BuildRequires: python3
BuildRequires: readline-devel
BuildRequires: sqlite
BuildRequires: sysuser-tools
BuildRequires: tcpd-devel
@ -363,7 +361,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
%patch -P 10 -p1
%endif
%patch -P 11 -p1
%patch -P 12 -p1
cp %{_sourcedir}/suse-test-run .
@ -393,14 +390,22 @@ cat %{SOURCE50} | tee -a mysql-test/unstable-tests
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter"
# Mariadb devs seems to fall in love with -Werror option
EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error"
export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS"
export CXXFLAGS="$CFLAGS -felide-constructors"
%cmake -DWITH_SSL=system \
-DWITH_LIBWRAP=ON \
-DENABLED_PROFILING=ON \
-DENABLE_DEBUG_SYNC=OFF \
-DWITH_PIC=ON \
-DWITH_ZLIB=system \
-DWITH_LIBEVENT=system \
-DWITH_JEMALLOC=no \
-DWITH_READLINE=OFF \
-DWITH_READLINE=0 \
-DWITH_LIBEDIT=0 \
-DWITH_EDITLINE=system \
-DINSTALL_LAYOUT=RPM \
-DWITH_LZ4=system \
-DMYSQL_UNIX_ADDR="%{_rundir}/mysql/mysql.sock" \
@ -408,6 +413,8 @@ cat %{SOURCE50} | tee -a mysql-test/unstable-tests
-DINSTALL_MYSQLSHAREDIR=share/%{name} \
-DWITH_COMMENT="MariaDB rpm" \
-DWITH_EXTRA_CHARSET=all \
-DDEFAULT_CHARSET=utf8mb4 \
-DDEFAULT_COLLATION=utf8mb4_unicode_520_ci \
-DWITH_INNOBASE_STORAGE_ENGINE=1 \
-DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
%if 0%{with_oqgraph} < 1
@ -420,18 +427,28 @@ cat %{SOURCE50} | tee -a mysql-test/unstable-tests
-DPLUGIN_ROCKSDB=NO \
%endif
-DPYTHON_SHEBANG=%{python_path} \
-DWITH_XTRADB_STORAGE_ENGINE=1 \
-DWITH_CSV_STORAGE_ENGINE=1 \
-DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \
-DWITH_INNODB_MEMCACHED=ON \
-DWITH_EMBEDDED_SERVER=true \
%if %{with galera}
-DWITH_WSREP=ON \
-DWITH_INNODB_DISALLOW_WRITES=1 \
%endif
-DWITH_LIBARCHIVE=ON \
-DWITH_MARIABACKUP=ON \
-DCOMPILATION_COMMENT="MariaDB package" \
-DDENABLE_DOWNLOADS=false \
-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
-DINSTALL_LIBDIR_RPM="%{_lib}" \
-DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DINSTALL_SQLBENCHDIR=share \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \

2
mysql-systemd-helper
View File

@ -116,7 +116,7 @@ mysql_upgrade() {
echo "Running upgrade itself..."
echo "It will do some chek first and report all errors and tries to correct them"
echo
if /usr/bin/mysql_upgrade --force --socket="$protected/mysql.sock"; then
if /usr/bin/mysql_upgrade --no-defaults --force --socket="$protected/mysql.sock"; then
echo "Everything upgraded successfully"
up_ok=""
rm -f "$mariadb_status_dir/.mariadb_run_upgrade"

5
suse_skipped_tests.list
View File

@ -48,9 +48,4 @@ binlog.max_binlog_total_size : since 11.4.2 - all
main.mysqld--help-aria : since 11.5.2 - all
plugins.feedback_plugin_load : since 11.5.2 - all
plugins.parsec : since 11.6.1 - all
unit.conc_connection : since 11.6.2 - all
innodb.log_file_name : since 11.6.2 - all
main.connect : since 11.6.2 - all
main.ssl_cipher : since 11.7.2 - all