Commit Graph

834 Commits

Author SHA1 Message Date
Michal Schorm
1e92e80480 [SPECfile fixup] Move bits regarding clustercheck around the SPECfile, so they are only used when galera sub-package is built
Build should now work correctly for both variants:
  %bcond_without galera
  %bcond_with galera

wsrep and clustercheck bits are meant to only be packed fi galera sub-package is being built
2024-06-10 23:09:24 +02:00
Michal Schorm
f5d17b63c1 Add wsrep_sst_rsync_tunnel script 2024-06-10 23:09:12 +02:00
Michal Schorm
a8701cb45d Set the minimal required version of the mysql-selinux package 2024-06-09 07:36:14 +02:00
Michal Schorm
603aa27cc7 Rebase to 10.11.8 2024-06-07 11:25:54 +02:00
Michal Schorm
948e9f4103 Rebase to 10.11.7 2024-06-07 08:08:21 +02:00
Michal Schorm
57325b1f99 [rpmlint fixup] mariadb10.11.spec:1: W: macro-in-comment %{name} 2024-06-06 23:10:20 +02:00
Michal Schorm
16ae5e13de SPECfile %files section fixup - add missing directories
Resolves: #2283500

--

Script used for checking the files inside "/usr/share/mariadb*"

| # Find directories that start with 'mariadb' under /usr/share/
| find /usr/share/ -type d -name 'mariadb*' | while read -r dir; do
|     # For each directory found, recursively find all files and directories
|     find "$dir" -print0 | while IFS= read -r -d '' file; do
|         rpm -qf "$file"	| grep -i -e "not owned"
|     done
| done

Results:

|  file /usr/share/mariadb-server is not owned by any package
|  file /usr/share/mariadb-server/groonga is not owned by any package
|  file /usr/share/mariadb-server/groonga-normalizer-mysql is not owned by any package
|  file /usr/share/mariadb/mroonga is not owned by any package
2024-05-27 17:48:37 +02:00
Michal Schorm
0690c54c41 [Fixup] Fix my.cnf dependency
Fixup of commit:
  commit 45b40b2e9c
  Author: Yaakov Selkowitz <yselkowi@redhat.com>
  Date:   Mon Apr 8 23:18:44 2024 -0400

Fixup contains:
 - use macro instead of '/etc/'
 - extend the condition to other occurences
2024-04-17 02:01:06 +02:00
Lukas Javorsky
50d8f28a89 Add gating.yaml, so it's not missed in the next branching of RHEL 2024-04-15 13:51:16 +00:00
Yaakov Selkowitz
45b40b2e9c Fix my.cnf dependency
Installation path macros are not allowed in file dependencies.
Starting with F40, these break flatpak builds entirely because
dnf5 only recognizes file deps in /etc, /usr/bin, and /usr/sbin,
not /app/etc.  At this point, mariadb-connector-c-config is the
sole provider of my.cnf.

https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies
2024-04-08 23:20:11 -04:00
Honza Horak
fa89209ac6 Enable test-suite during build 2024-02-16 13:39:08 +01:00
Filip Janus
19889e78e3 Release bump 2024-02-07 12:54:21 +01:00
Filip Janus
6673fbda85 Add architecture specific requirement in -server subpacakge 2024-02-05 21:09:33 +01:00
Filip Janus
a85be7152c Renaming macro names to be more descriptive 2024-02-05 20:33:34 +01:00
Honza Horak
6bab42f298 Remove %pkg_provides macro
This macro does not add any new provides that wouldn't be there automatically.
2024-02-05 13:44:38 +01:00
Honza Horak
b636fca34b Do not add automatic provides for private sub-packages
These sub-packages (errmsg and common) are only required by the same build
of mariadb. When built with the automatic provides (that adds %{_isa} as well),
these noarch sub-packages cause koji to complain and build to fail with:

BuildError: The following noarch package built differently on different
architectures: mariadb-errmsg-10.11.6-2.fc40.noarch.rpm
rpmdiff output was:
removed     PROVIDES mariadb-errmsg(x86-32) = 3:10.11.6-2.fc40
removed     PROVIDES mariadb10.11-errmsg(x86-32) = 3:10.11.6-2.fc40
added       PROVIDES mariadb-errmsg(x86-64) = 3:10.11.6-2.fc40
added       PROVIDES mariadb10.11-errmsg(x86-64) = 3:10.11.6-2.fc40
2024-02-05 09:25:42 +01:00
Filip Janus
aaaf2ae734 Add mariadbXX.XX provide 2024-02-02 09:37:15 +01:00
Filip Janus
6af9ed3656 Apply demodularization 2024-02-01 07:17:13 +01:00
Filip Janus
133a635f32 Import content from the mariadb component - branch rawhide
(f3da161f99)
2024-01-31 19:25:49 +01:00
releng bot
1f4ec4a305 Added the README 2024-01-31 16:03:08 +00:00
Honza Horak
f3da161f99 List all systemd files by name to avoid surprisind additions 2024-01-30 12:58:33 +01:00
Honza Horak
2498aaf726 Clean up spec from syntax issues 2024-01-30 12:58:32 +01:00
Michal Schorm
47753b9095 Remove temporary files created by the testsuite execution 2024-01-30 12:58:32 +01:00
Michal Schorm
44797c8193 Update skipped-tests-list for 10.11.6 release 2024-01-30 12:58:32 +01:00
Michal Schorm
9ac0430b0f [2/2] Rebase to 10.11.6 - start using upstream logrotate file
Explanation for removed notes follow:

| * Enable creation of the log file by logrotate (needed since
|   /var/log/ isn't writable by mysql user); and set the same 640
|   permissions we normally use.

This is an ancient artefact.
It originates in this commit from 2012 in the 'mysql' package in Fedora:
  https://src.fedoraproject.org/rpms/mysql/c/d3bdaa4a?branch=rawhide
That was at the time, when the DB log resided directly in '/var/log/', rather than '/var/log/some-dir-specific-for-the-DB/'.
Since that is no longer the case, the 'create 600 mysql mysql' directive is no longer necessary.

| * Comment out the actual rotation commands, so that user must edit
|   the file to enable rotation.  This is unfortunate, but the fact
|   that the script will probably fail without manual configuration
|   (to set a root password) means that we can't really have it turned
|   on by default.  Fortunately, in most configurations the log file
|   is low-volume and so rotation is not critical functionality.

This is no longer true.
Since MariaDB 10.4, which introduced authentication via the UNIX socket,
the 'root' and 'mysql' users can authenticate without login and password.

So we can go back to using 'mysqladmin', or 'mariadb-admin' in this case, to flush logs

| See discussions at RH bugs 799735, 547007
| * Note they are from Fedora 15 / 16

I found no more useful information there. Only information already mentioned in other notes here.

| Update 3/2017
| * it would be big unexpected change for anyone upgrading, if we start shipping it now.
|  Maybe it is good candidate for shipping with MariaDB 10.2 ?

Introduction of MariaDB 10.11 is the perfect time.

| * the 'mysqladmin flush logs' doesn´t guarantee, no entries are lost
|   during flushing, the operation is not atomic.
|   We should not ship it in that state

True, however, no one likely cares about that, in reality, since those logs don't hold any journal-like entries.
Explained here:
  https://github.com/MariaDB/server/pull/1556#issuecomment-941886220

| Update 6/2018
| * the SIGHUP causes server to flush all logs. No password admin needed, the only constraint is
|   beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can.
| * Submited as PR: https://github.com/MariaDB/server/pull/807

It has been dicussed on the upstream thoroughly and was found far from ideal.
Now, that we can use 'mysqladmin', or 'mariadb-admin' in this case, safely again,
there's no argument to keep using the PID file for flushing logs.

| Update 02/2021
| * Enhance the script as proposed in:
|   https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/

Enhanced again now. Significantly this time, however with a vision that the values will become an OS-independent defaults.

|  * Discussion continues in:
|   https://jira.mariadb.org/browse/MDEV-16621

Discussion finished.
Better start a new one, if needed.
2024-01-30 12:58:32 +01:00
Michal Schorm
bd6dffbdbc [1/2] Rebase to 10.11.6 - rebase 2024-01-30 12:58:32 +01:00
Michal Schorm
1098ece75f Rebase to 10.10.7 2024-01-30 12:58:32 +01:00
Michal Schorm
593047b070 Rebase to 10.9.8 2024-01-30 12:58:32 +01:00
Michal Schorm
628a935aea Rebase to 10.8.8 2024-01-30 12:58:32 +01:00
Michal Schorm
6f8e29f6c6 Rebase to 10.7.8 2024-01-30 12:58:32 +01:00
Michal Schorm
1bbc56a6d8 [3/3] Rebase to 10.6.16
update sources to the 10.6.16
2024-01-30 12:58:32 +01:00
Michal Schorm
1714af22b3 [2/3] Rebase to 10.6.16
Revert "Introduce the script for generating sources tarball without a code under a license which was not yet approved for Fedora or RHEL"
This reverts commit 7f8a0e15a6.

Note: MariaDB upstream removed TokuDB SE sources in 10.6.0
2024-01-30 12:58:32 +01:00
Michal Schorm
12aa851dee Rebase to 10.6.16
new sources are intentionally omitted from this commit

Remove manual pages already shipped by mariadb-connector-c package
2024-01-30 12:58:15 +01:00
Michal Schorm
4ebee0c23c Bump release to 100
to prepare for a production build after large set of changes in 'mariadb', 'community-mysql' and 'mysql' packages
2024-01-30 10:14:29 +01:00
Michal Schorm
01c183c3e5 F40 Change "MariaDB & MySQL repackaging" - Implement conflicts with 'mysql' and 'community-mysql' names 2024-01-30 10:12:28 +01:00
Michal Schorm
cabbe3794a Bump release for rebuild 2024-01-26 16:58:24 +01:00
Michal Schorm
c31ee2cc1a SPECfile enhancement - Make the 'mariadb-errmsg' and 'mariadb-common' sub-packages 'noarch'
The sub-package 'mariadb-common' contains XML files with character sets.
The sub-package 'mariadb-errmsg' contains 'errmsg.sys' files with error messages for various laguages

$ tree
.
├── mariadb-common-10.5.23-3.fc40.noarch
│   └── usr
│       └── share
│           ├── doc
│           │   └── mariadb
│           └── mariadb
│               └── charsets
│                   ├── armscii8.xml
│                   ├── ascii.xml
│                   ├── cp1250.xml
│                   ├── cp1251.xml
│                   ├── cp1256.xml
│                   ├── cp1257.xml
│                   ├── cp850.xml
│                   ├── cp852.xml
│                   ├── cp866.xml
│                   ├── dec8.xml
│                   ├── geostd8.xml
│                   ├── greek.xml
│                   ├── hebrew.xml
│                   ├── hp8.xml
│                   ├── Index.xml
│                   ├── keybcs2.xml
│                   ├── koi8r.xml
│                   ├── koi8u.xml
│                   ├── latin1.xml
│                   ├── latin2.xml
│                   ├── latin5.xml
│                   ├── latin7.xml
│                   ├── macce.xml
│                   ├── macroman.xml
│                   ├── README
│                   └── swe7.xml
├── mariadb-common-10.5.23-3.fc40.noarch.rpm
├── mariadb-errmsg-10.5.23-3.fc40.noarch
│   └── usr
│       └── share
│           └── mariadb
│               ├── bulgarian
│               │   └── errmsg.sys
│               ├── chinese
│               │   └── errmsg.sys
│               ├── czech
│               │   └── errmsg.sys
│               ├── danish
│               │   └── errmsg.sys
│               ├── dutch
│               │   └── errmsg.sys
│               ├── english
│               │   └── errmsg.sys
│               ├── errmsg-utf8.txt
│               ├── estonian
│               │   └── errmsg.sys
│               ├── french
│               │   └── errmsg.sys
│               ├── german
│               │   └── errmsg.sys
│               ├── greek
│               │   └── errmsg.sys
│               ├── hindi
│               │   └── errmsg.sys
│               ├── hungarian
│               │   └── errmsg.sys
│               ├── italian
│               │   └── errmsg.sys
│               ├── japanese
│               │   └── errmsg.sys
│               ├── korean
│               │   └── errmsg.sys
│               ├── norwegian
│               │   └── errmsg.sys
│               ├── norwegian-ny
│               │   └── errmsg.sys
│               ├── polish
│               │   └── errmsg.sys
│               ├── portuguese
│               │   └── errmsg.sys
│               ├── romanian
│               │   └── errmsg.sys
│               ├── russian
│               │   └── errmsg.sys
│               ├── serbian
│               │   └── errmsg.sys
│               ├── slovak
│               │   └── errmsg.sys
│               ├── spanish
│               │   └── errmsg.sys
│               ├── swedish
│               │   └── errmsg.sys
│               └── ukrainian
│                   └── errmsg.sys
└── mariadb-errmsg-10.5.23-3.fc40.noarch.rpm
2024-01-26 14:41:51 +01:00
Michal Schorm
752dc83d49 [21/21] SPECfile cleanup - fuser is no longer used
It has been removed from the script in 2018 in the commit:
  4024962c36
where it was replaced by mysqladmin call
2024-01-26 14:41:28 +01:00
Michal Schorm
dfc363eceb [20/20] SPECfile cleanup - Do not try to re-define the RPM %license Virtual File Attribute to a global macro
https://rpm-software-management.github.io/rpm/manual/spec.html

This code was likely meant to deal %license tag on systems without RPM 4.11,
which could happen when the maintainer wanted to keep close the content
of Fedora SPECfile and RHEL SPECfile at a time.

While in Fedora the RPM 4.11 was present for years before the commit that added this code,
it might not be the case in an old, but still active, RHEL at that time.
2024-01-26 14:41:20 +01:00
Michal Schorm
bfbe4efc59 [19/20] SPECfile cleanup - move general code blocks to a more logical place 2024-01-26 14:41:12 +01:00
Michal Schorm
e86906d050 [18/20] SPECfile cleanup - make sure the target directory exists
The 'mv' command failed after the last commit, beacuse the line
| install -p -m 644 -D selinux/%{pkg_name}-server-galera.pp %{buildroot}%{_datadir}/selinux/packages/targeted/%{pkg_name}-server-galera.pp
which was originally before the cracklib condition, created the target directory tree thanks to the
| install -D
functionality.
2024-01-26 14:41:04 +01:00
Michal Schorm
d8f486421c [17/20] SPECfile cleanup - reoder the 'install' phase
group up code blocks regarding same part of the software
2024-01-26 14:40:56 +01:00
Michal Schorm
f6b745b0a4 [16/20] SPECfile cleanup - explicit definition of Python shebang is not needed
The value we use is the upstream deafult:

| # grep -r -i -e "python_shebang" mariadb-10.5.23-downstream_modified
| mariadb-10.5.23-downstream_modified/storage/rocksdb/myrocks_hotbackup.py:#!@PYTHON_SHEBANG@
| mariadb-10.5.23-downstream_modified/cmake/cpack_deb.cmake:SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang")
| mariadb-10.5.23-downstream_modified/cmake/cpack_rpm.cmake:SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang")
| mariadb-10.5.23-downstream_modified/CMakeLists.txt:SET(PYTHON_SHEBANG "/usr/bin/env python3" CACHE STRING "python shebang")
| mariadb-10.5.23-downstream_modified/CMakeLists.txt:MARK_AS_ADVANCED(PYTHON_SHEBANG)
2024-01-26 14:40:47 +01:00
Michal Schorm
aeb2a7f20d [15/20] SPECfile cleanup - use the unversioned docdirs in a clean and straightforward way 2024-01-26 14:40:39 +01:00
Michal Schorm
dfed927a62 [14/20] SPECfile cleanup - patch configuration option has been upstreamed in 2016; #884755 2024-01-26 14:40:31 +01:00
Michal Schorm
5f1d5c3e1f [13/20] SPECfile cleanup - Remove single-purpose macro,
especially when it holds the same value as another macro
2024-01-26 14:40:24 +01:00
Michal Schorm
459b90c332 [12/20] SPECfile cleanup - Transform %require_mysql_selinux general macro to a control macro 2024-01-26 14:40:16 +01:00
Michal Schorm
9fa011378f [11/20] SPECfile cleanup - Reorder for readability
Order explanation:
- main parts of the package
- code enhancing the main parts of the package
- debug control
- other plugins and storage engines enabled by default
- other plugins and storage engines enabled only on Fedora
- other plugins and storage engines enabled only on Fedora only on specific architectures
2024-01-26 14:39:17 +01:00
Michal Schorm
b311ee784b [10/20] SPECfile cleanup - Reformat for readability,
add whitespace characters
2024-01-26 14:31:42 +01:00
Michal Schorm
f1fdad6a71 [9/20] SPECfile cleanup - Remove no-op code,
replace the only other use of the macro, and remove the macro entirely
2024-01-26 14:31:23 +01:00