diff --git a/mariadb-11.6.2.tar.gz b/mariadb-11.6.2.tar.gz deleted file mode 100644 index d84b142..0000000 --- a/mariadb-11.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bad85bd1c77168afcae5db1396c0c52044dc044f7eae6fff5ac3cd4dec89bbd -size 111127834 diff --git a/mariadb-11.6.2.tar.gz.asc b/mariadb-11.6.2.tar.gz.asc deleted file mode 100644 index 778c48e..0000000 --- a/mariadb-11.6.2.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmczh+8ACgkQ8WVvJMdM -0dgH2hAAyzYb3D1sHaeIu+z0MdP6QfeUQ7auNS/bLXtFvsyD+oj0G6cdKFyk3QDQ -Qt3GL2eLuNcf3opgRfLnVG9Zjl2GED0Vo1runcCCyNT1sjhv/XNCE72Ki82GMZ1e -MlS8PKuAj0vv06BvaSGylwjp4p8egfFT9IeyDCBA0dBPwHswHTM1gSfi85jPSDaH -N+TBwHXjgRakwX8KuDLHd0A+ett6xs+9fyAecYKsXG0J+o0xuGR6K8u2SYBV4I0V -Oxox02K9n/ca7dDpiHKiMEHOTjcHTQfTX6aMviCOvSZiHDsto2eVrUCBE6+Ya6+c -2VO0QrWYO4J1Lj4SXhP0gyC3rYPqBZXRj2BqMgDAYF+FCL3jKRW/JPDL2H/NkOy+ -8LUQ2hEtf26lOzAEZ/ZHBQD1Ehg7TRExKSgusFDGBmO87CBT/ZJ6gl7oLy5b/fgr -xDS4DPrepDYHFAbp05SEU8lQH0vJj9G0BnwPjpIpfv3Qa2UwnITJlbXIRH2GQA7G -VvnMnxk6dLHZLwT0T1Of8gy0lpnBIU9qPZaktlShAW/TpNk6D4ayQqir5soKWtiG -TJcRBuk73S1KCiZn9tEYLfOhV+L5jQwqbsukwVLChrLXfvA1IX406CZQlri2CfE1 -YaY2Qu39CB7DJ9Mi9g7ZCHZvwJ1JjOfbtg5/h2/GVwGEeFaBWN8= -=5moe ------END PGP SIGNATURE----- diff --git a/mariadb-11.7.2.tar.gz b/mariadb-11.7.2.tar.gz new file mode 100644 index 0000000..febf98b --- /dev/null +++ b/mariadb-11.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:557a89f08e74015d1d6909595e003dca75d4df21ed1ef8180d63cdd74e5e71b3 +size 112783230 diff --git a/mariadb-11.7.2.tar.gz.asc b/mariadb-11.7.2.tar.gz.asc new file mode 100644 index 0000000..70d9afa --- /dev/null +++ b/mariadb-11.7.2.tar.gz.asc @@ -0,0 +1,16 @@ +-----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----- diff --git a/mariadb.changes b/mariadb.changes index 2554e43..ce81842 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Feb 19 21:55:34 UTC 2025 - Antonio Teixeira + +- Update list of skipped tests + +------------------------------------------------------------------- +Wed Feb 19 07:05:37 UTC 2025 - Jiri Slaby + +- 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 + +- 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 diff --git a/mariadb.spec b/mariadb.spec index c30fdd7..e9038b9 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -52,7 +52,7 @@ # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available %define with_cracklib_plugin 0 Name: mariadb -Version: 11.6.2 +Version: 11.7.2 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception @@ -113,6 +113,7 @@ 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 @@ -392,22 +393,14 @@ 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=0 \ - -DWITH_LIBEDIT=0 \ - -DWITH_EDITLINE=system \ + -DWITH_READLINE=OFF \ -DINSTALL_LAYOUT=RPM \ -DWITH_LZ4=system \ -DMYSQL_UNIX_ADDR="%{_rundir}/mysql/mysql.sock" \ @@ -415,8 +408,6 @@ export CXXFLAGS="$CFLAGS -felide-constructors" -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 @@ -429,28 +420,18 @@ export CXXFLAGS="$CFLAGS -felide-constructors" -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" \ diff --git a/suse_skipped_tests.list b/suse_skipped_tests.list index 2f15ab1..b9418e4 100644 --- a/suse_skipped_tests.list +++ b/suse_skipped_tests.list @@ -52,4 +52,5 @@ 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