Commit Graph

629 Commits

Author SHA1 Message Date
Honza Horak
0d4a89ed92 Fix md5 in FIPS mode with OpenSSL 3.0.0
OpenSSL 3.0.0+ does not support EVP_MD_CTX_FLAG_NON_FIPS_ALLOW any longer.
In OpenSSL 1.1.1 the non FIPS allowed flag is context specific, while
in 3.0.0+ it is a different EVP_MD provider.

  Resolves: #2050541
2022-02-07 23:01:38 +01:00
Michal Schorm
db03980787 Diable upstream hardening - it overrides the default compilation flags of the distribution, but provides lower level of hardening than the default flags
This issue was originally discovered by Annocheck stack-protection test in RHEL 9: #2044388

The -DSECURITY_HARDENED is used to force a set of compilation flags for hardening
The issue is that the MariaDB upstream level of hardening is lower than expected by Red Hat
We disable this option to the default compilation flags (which have higher level of hardening) will be used
2022-02-07 14:02:25 +01:00
Fedora Release Engineering
b0ed606846 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 18:41:24 +00:00
Michal Schorm
612f03d82b Fix the RPM condition for when the client subpackage is not built 2022-01-14 15:17:06 +01:00
Michal Schorm
452e11f762 Fix the RPM condition for when the test subpackage is not built but the PAM plugin subpackage is 2022-01-14 10:51:36 +01:00
Michal Schorm
ede543499e Fix the RPM condition for when the test subpackage is not built but the embedded server subpackage is 2022-01-14 10:50:57 +01:00
Michal Schorm
860088c5ca Fix the RPM condition for when the galera subpackage is not built 2022-01-14 10:50:13 +01:00
Michal Schorm
a1003a7c33 Fix the RPM condition for when the PAM plugin subpackage is not built 2022-01-14 10:48:53 +01:00
Michal Schorm
439d015366 Fix whitespaces in the echo, so both variables are prefixed with exactly one whitespace 2022-01-13 12:52:50 +01:00
Michal Schorm
b8157c3994 Fix the regular expression used to pick up the PCRE2 version the upstream bundles
Upstream changed the URL from which they download the PCRE2 tarball
2022-01-13 12:52:45 +01:00
Lukas Javorsky
fc088dbe49 Revert "Disable dtrace for the arm architecture due to FTBFS during gcc compiling"
This reverts commit b3e0e11edd.

The issue in systemtap is fixed now
https://sourceware.org/git/?p=systemtap.git;a=commit;h=34facf7ee6b43dae66cc109973a4eda42e439163
2021-12-16 13:06:56 +01:00
Michal Schorm
314d2bf8f0 Rebase to 10.5.13
- Full testsuite checked
- Patch 16 upstreamed
2021-12-02 11:16:46 +01:00
Michal Schorm
643c233529 Enable LTO
Resolves: #1994993
2021-12-01 14:27:13 +01:00
Michal Schorm
9fa16bbecc Fix OpenSSL 3 patch
It has to be applied AFTER the mariadb-ssl-cipher-tests.patch
2021-12-01 14:26:45 +01:00
Michal Schorm
f443a82bd6 Apply OpenSSL 3 patch picked from the upstream developement branch for MariaDB 10.8 2021-12-01 13:51:44 +01:00
Lukas Javorsky
b3e0e11edd Disable dtrace for the arm architecture due to FTBFS during gcc compiling
Temporary workaround for BZ#2026600

Problem with the GCC is already beeing discussed in upstream's Bugzilla
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103395

This commit should be reverted when the GCC fixes the issue on their
side
2021-12-01 13:46:11 +01:00
Sahana Prasad
17657ce119 Rebuilt with OpenSSL 3.0.0 2021-09-14 19:07:41 +02:00
Marek Kulik
3b8ee8379a Fix mysql_setpermission bug (#1976224)
This patch fixes bug in mysql_setpermission perl script
by adding conditionally port information to connections parameters.

More information about this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1976224

This bug has been fixed in upstream.
Patch can be removed when new version with fix is released.

https://github.com/MariaDB/server/pull/1896
2021-08-26 12:59:44 +02:00
Michal Schorm
8461c0e791 Rebase to 10.5.12 2021-08-07 09:57:12 +02:00
Michal Schorm
778adde283 Enhance the usage of the "echo" program to get better formated output 2021-08-07 09:57:12 +02:00
Michal Schorm
eab3fb692c Revert a single change from the previous commit so that the commit #7f8a0e15a can be cleanly reverted, when the time comes.
The commented "Source0" line in the #7f8a0e15a commit raises RPMLint warnings.
While it is good to have the code without such warnings, the value of the clean revert of the whole #7f8a0e15a commit is higher.

The RPMLint warning for "macro in a comment" is meant for cases, when the macro in the comment would be expanded to multiple lines.
The additional lines won't be commented out as the original line with the unexpanded macros.
That leads to an unwated code execution.
The macro "%{version}" is a single line macro, so no real issue should arise here.
2021-08-06 19:35:31 +02:00
Lukas Javorsky
5659759831 Set user_map.conf file to be noreplace config file
Related: BZ#1989534
2021-08-03 15:18:59 +02:00
Fedora Release Engineering
ff0b1ccf09 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 13:45:05 +00:00
Lukas Javorsky
f45390c986 Rebuild against pcre2-10.37 (bug #1965025) 2021-07-14 11:10:13 +02:00
Michal Schorm
ad41c37057 Rebase to 10.5.11 2021-07-01 09:23:24 +02:00
Michal Schorm
e96ef648dd Explicitly disable building of the Columnstore SE
until it is packed properly

Undefined behaviour leads to the SE being built by default on systems that have the necessary devel package installed
Resolves: #1960161
2021-05-14 16:20:09 +02:00
Michal Schorm
f192442cc3 Remove TokuDB Storage Engine subpackage
The TokuDB SE from Percona upstream has been deprecated in MariaDB 10.5 and completely removed in MariaDB 10.6
In Fedora, we don't build it since MariaDB 10.5
2021-05-12 05:41:16 +02:00
Michal Schorm
47762ab9fc Use the modified sources; bump release 2021-05-12 05:33:16 +02:00
Michal Schorm
b3ff1d5772 Ignore missing files during "rm -r" 2021-05-12 05:33:16 +02:00
Michal Schorm
7f8a0e15a6 Introduce the script for generating sources tarball without a code under a license which was not yet approved for Fedora or RHEL
Change the name of the sources archive, so the maintainer will encounter an error when uploading new sources which haven't undergo modification by this script
2021-05-12 05:33:16 +02:00
Michal Schorm
b14945398c Fix RPMLint warning: incoherent-version-in-changelog 10.5.10-1 ['3:10.5.10-1.fc35', '3:10.5.10-1'] 2021-05-11 21:40:39 +02:00
Michal Schorm
2e03a737bb Update RPMLint whitelist; fix RPMLint findings 2021-05-11 21:36:11 +02:00
Daniel Black
fcdfad8ad8 update package descriptions
Use mariadbd rather than mysqld in package descriptions.

Changed community branch of MySQL to "fork from", since branch
implies far too many updates from or back to the original
which isn't true.

Updated server-galera package description as it didn't
reference Galera at all.
2021-05-11 12:04:41 +00:00
Daniel Black
df76620f9e rename mysql scripts to mariadb
Use mariadb names in the scripts too.
2021-05-11 12:01:29 +00:00
Daniel Black
00056934fb Drop README.mysql-license, there are no exceptions
MariaDB has LGPL-2.1 for the licensing of Connector/C

This is the submodule in libmariadb on the server repository
from which the client libraries are built.

ref: https://github.com/mariadb-corporation/mariadb-connector-c

From upstream:
  e4da179b03
2021-05-11 12:01:29 +00:00
Michal Schorm
b84b8cfc8c Rebase to 10.5.10 2021-05-11 05:10:04 +02:00
Michal Schorm
939918b1e0 Fix package Conflicts on other OS than Fedora
The "community-mysql" packgae is named just "mysql" on RHEL & CentOS
2021-05-02 15:17:53 +02:00
Jonathan Wakely
a5d57f3520 Rebuilt for removed libstdc++ symbol (#1937698) 2021-03-30 19:37:59 +01:00
Michal Schorm
098e789957 Remove all upstream Systemd service files from the datadir
---

Until now, we remove "mysql*" named upstream service files from the datadir, but leave the others.
IMO we should either ship them all or remove them all.

I see no benefit in keeping upstream service files, since they use different logic, capabilities, and starts scripts as root; unlike our downstream Systemd service files.
2021-03-19 15:33:47 +00:00
Michal Schorm
e9fc8adf5d Bump release for rebuild 2021-03-19 15:57:56 +01:00
Michal Schorm
51cd6d3ae2 Move PAM authentication plugin to a standalone sub-package, suggested by the server sub-package to minimize potential security risks to only to the users which will install this plugin. https://jira.mariadb.org/browse/MDEV-25126 2021-03-19 15:57:56 +01:00
Michal Schorm
c356ff4717 Bump release for rebuild 2021-03-18 04:20:34 +01:00
Michal Schorm
51dee9887b Fix file permissions for the PAMv2 authentication plugin
Access to this SUID-to-root binary MUST be restricted.
https://jira.mariadb.org/browse/MDEV-25126
2021-03-18 04:14:39 +01:00
Michal Schorm
c90aa83afe Remove the patch for the mysql_install_db script
The patched piece of code was actually never executed, because of the following condition:
  "$in_rpm" -eq 0
However we call the script with the "--rpm" option from the Systemd service file:
  https://src.fedoraproject.org/rpms/mariadb/blob/rawhide/f/mysql-prepare-db-dir.sh#_100
2021-03-18 04:00:52 +01:00
Michal Schorm
910309466e Fix comment, use macro
This obsoletes:
  https://src.fedoraproject.org/rpms/mariadb/pull-request/23
2021-03-18 03:18:43 +01:00
Michal Schorm
d61a5d2f31 Move bits around, have all service files stuff together
Shouldn't bring any changes to functionality
2021-03-18 03:10:06 +01:00
Zbigniew Jędrzejewski-Szmek
14c9375f3f Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
2021-03-02 16:13:31 +01:00
Michal Schorm
15e98d0c18 Remove old unapplied patch for Spider SE on armv7hl
The patch was originally a copy of an upstream commit fixing this issue
Now the commit is a part of the server codebase

https://jira.mariadb.org/browse/MDEV-18737
ddce859076

I stopped applying the patch with 10.5.0 release
2021-02-27 01:22:05 +01:00
Michal Schorm
33b0b7903b Rebase to 10.5.9 2021-02-24 14:43:35 +01:00
Lukas Javorsky
7d46a8244f Replace the tokudb Obsoletes to the right place
Resolves: #1928757
2021-02-16 16:57:15 +01:00
Michal Schorm
f20aec3d3d Enhance the logrotate script as proposed in:
https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/

Resolves: #1683981
2021-02-12 08:47:54 +01:00
Michal Schorm
e5b5fcdcf7 MariaDB switched to using "DBD::MariaDB" Perl database driver instead of the "DBD::mysql" in MariaDB 10.5.0 version
Upstream issue:
  https://jira.mariadb.org/browse/MDEV-19755

Upstream commit:
  5cc2096f93 (diff-8576e5effae0770fc984e35e6749c43a8946489a1b478ce54facb3b9086622bf)

Scripts that rely on a specific driver won't work with differently named driver
Following scripts are affected:
  mysql_convert_table_format.sh
  mysql_setpermission.sh
  mysqlhotcopy.sh
  mytop.sh
as well as several tests for various components

So changing the required package to match the needs of the scripts

Testing:
Following command:
  mysql_setpermission --user=root --host=127.0.0.1 --port=3306
Would fail with:
  install_driver(MariaDB) failed: Can't locate DBD/MariaDB.pm in @INC (you may need to install the DBD::MariaDB module)
2021-02-12 07:11:11 +01:00
Michal Schorm
6279ba9cd7 Add missing dependency for the mariadb-test subpackage 2021-02-11 05:54:59 +01:00
Michal Schorm
5087a8f282 Add support for S3 storage engine 2021-02-10 14:14:46 +01:00
Michal Schorm
153eaac4b2 Revert "For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services"
This reverts commit 7c52598552.

Wee need to discuss this further.
2021-02-02 16:07:12 +01:00
Michal Schorm
a475c7ef2f Fix port range calculation formula for the testsuite
It was discovered, that the each number results to 20 ports range selected, instead of 10 ports range, so the maximum number must be divided by 2.
2021-02-02 15:34:16 +01:00
Michal Schorm
f45638f43a Remove README.mysql-cnf
The example configuration files, located in "/usr/share/mariadb/", named "*.cnf"
were dropped in MariaDB 10.3 and we haven't shipped them since
2021-02-01 01:33:17 +01:00
Michal Schorm
d282b9922b Allow to run the test-suite in parallel when more versions are built 2021-02-01 00:40:49 +01:00
Michal Schorm
7c52598552 For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services 2021-02-01 00:38:04 +01:00
Honza Horak
e586e88803 For compatibility with upstream RPMs, create mysqld symlink in sbin 2021-01-29 09:36:04 +01:00
Honza Horak
3b1a6d2020 Remove a dangling symlink after tests end
Related: #1903659

RPMDiff issue says:
File opt/rh/rh-mariadb105/root/usr/share/mysql-test/var is a dangling symlink (to /dev/shm/var_64_BuRk) on x86_64
2021-01-28 16:52:21 +01:00
Fedora Release Engineering
862568e0f8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 19:15:47 +00:00
Lukas Javorsky
67fe36f42d Resolve tokudb-engine deprecated problem
BZ#1906559
2021-01-12 13:32:18 +01:00
Tom Stellard
69cb3d49af Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-06 21:27:25 +00:00
Michal Schorm
e88cf6fb71 Specfile cleanup
- fix conditions for building minimal server
- fix expected logfile permissions, so `rpm -V` would be satisfied
2020-12-07 08:48:44 +01:00
Michal Schorm
6cec766bc6 Add description of the 'clustercheck.sh' script 2020-12-07 08:48:31 +01:00
Michal Schorm
8c1b8ae695 Rebase to 10.5.8 2020-11-12 01:51:15 +01:00
Michal Schorm
51b8f2af1b Rebase to 10.5.7 2020-11-06 03:42:13 +01:00
Michal Schorm
405df6a0a5 Add workaround for https://pagure.io/fm-orchestrator/issue/1614 2020-10-22 15:13:57 +02:00
Michal Schorm
04c626f762 Fix of mariadb-ownsetup patch. Since we do CMake out-of-source builds, and the SOURCE and BUILD directiories differ, the bug that was present in the patch started to cause a issues.
In the CMake "CONFIGURE_FILE(<input> <output>)" command, the <input> path is treated relative to SOURCE dir, however the <output> patch is relative to BUILD dir.
Since the file has been copied to a wrong location, instead in-place updated as originally intended, the file that was later installed was the original unchanged file.

Resolves: #1873999, #1874446

Fix mariadb-pcdir.patch hunk
2020-10-22 14:02:19 +02:00
Lukas Javorsky
21e76c8255 Rebase to 10.5.5
Add manual for aria_s3_copy
2020-10-22 14:02:19 +02:00
Lukas Javorsky
2b8b704762 Rebase to 10.5.4 2020-10-22 14:02:19 +02:00
Lukas Javorsky
be6da51b15 Rebase to 10.5.3
Add failing tests
2020-10-22 14:02:19 +02:00
Michal Schorm
8d4561c7a1 Rebase to 10.5.2 - Beta
TokuDB SE has been deprecated https://jira.mariadb.org/browse/MDEV-19780
Remove the RocksDB manpage when RocksDB is not built
Add failing tests
2020-10-22 14:02:19 +02:00
Michal Schorm
a35e17b2cb Rebase to 10.5.1 - Beta Update to build against PCRE2 2020-10-22 14:02:19 +02:00
Michal Schorm
1dd39c3767 Rebase to 10.5.0 - Alpha 2020-10-22 14:02:19 +02:00
Michal Schorm
4e960545a8 The testsuite passed several times on all architectures
Switch to the basic set until new upstream release
2020-09-06 23:21:38 +02:00
Michal Schorm
81a4f8d04e Fix building when built with "%bcond_with test"
(which means: without the testsuite)
2020-09-06 23:21:29 +02:00
Michal Schorm
76e6c4c773 Fix of mariadb-ownsetup patch.
Since we do CMake out-of-source builds, and the SOURCE and BUILD directiories differ, the bug that was present in the patch started to cause a issues.

In the CMake "CONFIGURE_FILE(<input> <output>)" command, the <input> path is treated relative to SOURCE dir, however the <output> patch is relative to BUILD dir.
Since the file has been copied to a wrong location, instead in-place updated as originally intended, the file that was later installed was the original unchanged file.

Resolves: #1873999, #1874446
2020-09-03 13:41:45 +02:00
Michal Schorm
24c0e12fb3 Rebase to 10.4.14 2020-08-20 14:12:14 +02:00
Michal Schorm
c031558f68 Do CMake out-of-source builds
Force the CMake change regarding the in-source builds also to F31 and F32
Use CMake macros instead of cmake & make direct commands
%%cmake macro covers the %%{set_build_flags}, so they are not needed
Other changes to compile flags must be specified *after* the %%cmake macro
2020-08-18 14:59:54 +02:00
0691fec148 Update expected bundled PCRE version
c1291d7a6b
2020-08-07 10:49:30 +00:00
aace92178f Move mysqld_safe_helper back to server subpackage
mysqld_safe is a script that calls the mysqld_safe_helper binary, so
being able to install one without the other doesn't make sense.
2020-08-07 10:47:24 +00:00
8dd95cd3f6 Fix %ifarch usage
When rebuilding mariadb on EL7, I noticed that tokudb, mroonga, and
rocksdb were enabled, despite what this conditional appears to do.
After some experimentation, I can see that %ifarch does not support
appending another conditional with &&.  To achieve the desired logic,
the statement must be separate conditionals.
2020-08-07 10:45:06 +00:00
Jeff Law
cdfc0ff977 Disable LTO 2020-08-05 14:26:56 -06:00
Fedora Release Engineering
70dd4cf2bc - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 04:24:00 +00:00
Fedora Release Engineering
1fa717acc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 06:52:51 +00:00
Michal Schorm
53d9ba46f0 Make conflicts between corresponding mariadb and mysql packages explicit
Get rid of the Conflicts macro, it was intended to mark conflicts with *upstream* packages
2020-07-14 15:04:03 +02:00
Michal Schorm
d8b968613a Extend Perl "Requires" filtering to wsrep
Resolves: #1845376
2020-06-18 12:55:01 +02:00
Michal Schorm
43456681ea Remove PCDIR patch, upstreamed (in a way)
The upstream now defaults to the location we need, although the server pkgconfig file location is still NOT configurable.
The CMake INSTALL_PCDIR option affects only the client library pkgconfig file location.
2020-06-09 13:12:19 +02:00
Michal Schorm
99964e0b7f Minor tweaks
- use %ifarch consistently through the SPECfile
- update minimal PCRE version needed
- reword %prep section (move all removals to one place)
2020-06-08 10:25:56 +02:00
Michal Schorm
5df7c2e7c7 The testsuite for 10.4.13 has been tested.
There was one randomly failing test: "spider/bugfix.wait_timeout"
2020-06-08 10:25:56 +02:00
Michal Schorm
383e14b547 Rebase to 10.4.13
Patch mariadb-pythonver upstreamed (upstream now use only python 3)
2020-06-08 10:25:56 +02:00
Lukas Javorsky
e0f7005539 Add mariadb_rpl.h to deleted libraries from devel package 2020-05-24 10:48:58 +02:00
Björn Esser
6fa3c4c473
Bump release 2020-04-02 13:32:14 +02:00
Björn Esser
333a690a99
Fix string quoting for rpm >= 4.16 2020-04-02 13:05:45 +02:00
Jitka Plesnikova
3731874e5e Add perl dependencies needed for tests 2020-03-27 08:37:56 +01:00
Michal Schorm
5ef66fdfa5 Rebase mariadb-connector-c git submodule to commit fbf1db6
For fix: https://jira.mariadb.org/browse/CONC-441
2020-03-16 11:41:19 +01:00
Michal Schorm
0e21d7319c Update the fix for building in the debug mode
Upstream tracker: https://jira.mariadb.org/browse/MDEV-19740
2020-03-10 09:29:49 +01:00
Michal Schorm
55406c8293 Rebase to 10.4.12 2020-02-07 14:34:26 +01:00