Commit Graph

758 Commits

Author SHA1 Message Date
Lukas Javorsky
b6ec88a877 Rebase to version 10.5.20
Patches 11 and 13 were upstreamed:
75bbf645a6
f575de39af

Resolves: CVE-2022-47015
2023-06-01 10:54:51 +00:00
Siddhesh Poyarekar
cb41bf05f1 Use _fortify_level to disable fortification in debug builds 2023-04-29 02:07:13 +02:00
Michal Schorm
aa28093e35 Fix RPM syntax: '%patchN' has been deprecated
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/VBFDPQHAHF3WG6WBZR2L5GSWMW6CVTJS/
2023-04-29 02:02:41 +02:00
Michal Schorm
70b643e1b3 Rebase to 10.5.19 2023-04-29 01:57:59 +02:00
Florian Weimer
2efa260d36 Port to C99
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2023-04-11 10:07:18 +02:00
Yaakov Selkowitz
752281ea43 Fix build with GCC 13 2023-01-24 14:15:29 -05:00
Fedora Release Engineering
974cfc625b Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 18:56:49 +00:00
Michal Schorm
c1ffd3ffe0 Rebase to 10.5.18 - add new sources 2022-11-16 12:06:29 +00:00
Michal Schorm
9f12d914a4 Rebase to 10.5.18
OpenSSL 3 patch upstreamed
2022-11-16 11:50:28 +00:00
Fedora Release Engineering
ff7a95c651 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 20:30:31 +00:00
Michal Schorm
f4c6b60962 Release bump for rebuild 2022-06-13 13:41:31 +02:00
Michal Schorm
255d71466a rpminspect - introduce a global ignore list 2022-06-11 10:17:03 +02:00
Michal Schorm
7b9fc23a15 Update the version number of the bundled PCRE2
The PCRE2 version used by upstream in the 'MariaDB 10.5.16' release is '10.40'
2022-05-30 18:06:22 +02:00
Michal Schorm
5a109bbad2 Pack newly introduced translations 2022-05-23 20:34:11 +02:00
Michal Schorm
3d9af144da Rebase to 10.5.16 2022-05-23 20:34:11 +02:00
Michal Schorm
03890c75fc Remove the second source path definition from the CMake command
The '%cmake' RPM macro in Fedora actually expands to:
| ...
|   /usr/bin/cmake \
|         -S "." \
|         -B "redhat-linux-build" \
| ...

So in this case the source patch was specified twice.
First in the macro with the '-S' option and second time outside of the macro,
in the SPECfile, without the '-S' option.

CMake upstream declares that:
|  This has never been officially documented or supported,
|  but older versions accidentally accepted multiple source paths
|  and used the last path specified. Update scripts to avoid
|  passing multiple source path arguments.
https://cmake.org/cmake/help/v3.23/release/3.23.html#deprecated-and-removed-features

This was discovered as CMake upstream implemented a change to the 3.23.0-rc2 release
that changed this behavior and it broke many Fedora packages that used this
double source path definition.
  See rhbz#2057738 to see how build behaved

After the CMake upstream got aware of what problems it caused in Fedora,
they opened a merge request to restore the behavior to the old one,
but kept the warnings that that is an unsupported and problematic behavior:
  https://gitlab.kitware.com/cmake/cmake/-/issues/23334

---

As for today, this issue is still not yet fully resolved.
- The CMake maintainers in Fedora haven't rebased the package to 3.23-1 release, so it is still broken
- Affected packages in Fedora should find a way to stop using this unsupported behavior
- The double '-S' argument passing should be marked as problematic too, in the exact same way
  https://gitlab.kitware.com/cmake/cmake/-/issues/23334#note_1159258
- A change to the %cmake Fedora RPM macro might be in play, so it won't force a source path
  https://gitlab.kitware.com/cmake/cmake/-/issues/23334#note_1159258

I opened a BZ #2079833 to track the progress of the solution by CMake maintainers
2022-04-28 14:14:56 +02:00
Michal Schorm
655a2f039f Remove the file of the patch 'mariadb-scripts-setpermission.patch'
The patch stopped being applied during the rebase to 10.5.13 (commit #314d2bf), because it was upstreamed,
but I forgot to remove the patch file.
2022-02-26 05:26:22 +01:00
Michal Schorm
5dcec0d8d0 Patch for pkgconfig directory has been upstreamed
The upstream implementation is to NOT make it configurable, but to put it on the correct location instead:
  c5c1027c6e
2022-02-26 05:14:00 +01:00
Michal Schorm
94d43bc3f7 Another fixup for: 0d4a89ed9 "Fix md5 in FIPS mode with OpenSSL 3.0.0"
The condition has to be fixed, as the OpenSSL 3 was introduced into the Fedora 36, instead of Fedora 35
  https://fedoraproject.org/wiki/Changes/OpenSSL3.0
2022-02-24 02:46:27 +01:00
Michal Schorm
56aea7f718 Fixup for: 0d4a89ed9 "Fix md5 in FIPS mode with OpenSSL 3.0.0"
The 'mariadb-fips.patch' patch has to be applied conditionally. It will FTBFS on releases without OpenSSL 3.

---

/builddir/build/BUILD/mariadb-10.5.15-downstream_modified/mysys_ssl/my_md5.cc: In function 'void md5_init(EVP_MD_CTX*)':
/builddir/build/BUILD/mariadb-10.5.15-downstream_modified/mysys_ssl/my_md5.cc:56:9: error: 'EVP_MD_fetch' was not declared in this scope; did you mean 'EVP_MD_flags'?
   56 |   md5 = EVP_MD_fetch(NULL, "MD5", "fips=no");
      |         ^~~~~~~~~~~~
      |         EVP_MD_flags
/builddir/build/BUILD/mariadb-10.5.15-downstream_modified/mysys_ssl/my_md5.cc:63:3: error: 'EVP_MD_free' was not declared in this scope; did you mean 'EVP_MD_type'?
   63 |   EVP_MD_free(md5);
      |   ^~~~~~~~~~~
      |   EVP_MD_type
gmake[2]: *** [mysys_ssl/CMakeFiles/mysys_ssl.dir/build.make:149: mysys_ssl/CMakeFiles/mysys_ssl.dir/my_md5.cc.o] Error 1
2022-02-24 02:07:46 +01:00
Michal Schorm
e94e1c9253 Remove bits only relevant for EOL Fedora 32 and older 2022-02-23 13:59:59 +01:00
Michal Schorm
62af7d57f2 Rebase to 10.5.15
Logrotate patch rebased onto upstream commit:
  008c02c987

Groonga patch upstreamed:
  045f5f7b10

OpenSSL 3 patch rebased onto upstream commit:
  be1d965384

OpenSSL 3 CMake condition reverted - it should be only applied to series without OpenSSL 3 patch:
  c9beef4315

Full testsuite success on a Fedora Rawhide scratch build,
setting "last_tested_version" to 10.5.15 so only the "main" test suite will be run on subsequent
builds of the same MariaDB release
2022-02-23 13:57:02 +01:00
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
Zuzana Miklankova
98fafb1bc7 Whitelisting file Index.xml from rpminspect xml check
Reason is, that the bug is already reported on upstream:
https://jira.mariadb.org/browse/MDEV-26905.
Also we currently do not know how to fix it. If we eventually figure out
how to fix this bug, then the patch would be submitted directly to the
upstream, rather than to downstream, to avoid unintentionally breaking
some code that relied on the malformed XML.
2022-01-12 09:07:22 +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
Zuzana Miklankova
cf60f44fa1 Disable badfunct rpinspect CI check for /usr/bin/resolveip, BZ1973194
Resolveip binary is only used in mysql_install_db.sh script,
and only in non-"--rpm" mode [1]. However, we call this script with
"--rpm" option enabled, and thus the resolveip is not used [2],
and its badfuncs check can be disabled. [3]

[1] https://gitlab.com/redhat/centos-stream/rpms/mariadb/-/blob/c9s/mariadb-prepare-db-dir.sh#L100
[2] 5566cbadb0/scripts/mysql_install_db.sh (L425-L441)
[3] https://bugzilla.redhat.com/show_bug.cgi?id=1973194#c4
2021-12-01 14:14:29 +01:00
Zuzana Miklankova
866cfb97a4 Add ignorefiles for xmllint rpminspect check
based on https://lists.launchpad.net/maria-discuss/msg06133.html
discussion are all the invalid xmls (except for Index.xml)
present in the sources on purpose and the xmllint
check can be thus disabled in the CI process.

All of xmlfiles, whose warnings are being supressed with this commit are
being used for testing.

A bug report [https://jira.mariadb.org/browse/MDEV-26905] was created
for the Index.xml file.

Fedora CI picks up the rpmlimspect.yaml for specific package in the
dist-git repo [ref:
https://rpminspect.readthedocs.io/en/latest/configuration.html#rpminspect-yaml
]

Replace xmllint shutdown with ignoring specific xmls in the xml check
2021-12-01 12:58:03 +00: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