diff --git a/.gitignore b/.gitignore index 7e2c68d..b4c5788 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-5.5.64.tar.gz +SOURCES/mariadb-5.5.65.tar.gz diff --git a/.mariadb.metadata b/.mariadb.metadata index 055fb28..5f80820 100644 --- a/.mariadb.metadata +++ b/.mariadb.metadata @@ -1 +1 @@ -39ee4db628c775f378e6f19206e8a329d94e24ff SOURCES/mariadb-5.5.64.tar.gz +886f157260e696e793bf0b270ca1393aaa219617 SOURCES/mariadb-5.5.65.tar.gz diff --git a/SOURCES/mariadb-norelocatable.patch b/SOURCES/mariadb-norelocatable.patch new file mode 100644 index 0000000..399cca9 --- /dev/null +++ b/SOURCES/mariadb-norelocatable.patch @@ -0,0 +1,78 @@ +Revert upstream changes to make the mysql_install_dbrelocatable + +Resolves: #1731062 + +Upstream intended to make the mysql_install_db script to be relocatable, which +is not a supported use case in RHEL. Because of different layout (mysqld in +/usr/libexec while all other binaries in /usr/bin) these changes broke +mysql_install_db if run without arguments (we use --rpm in the systemd so we +didn't meet this issue there). Reverting changes upstream did fixes the +standalone run of mysql_install_db again. + +Original upstream issue: https://jira.mariadb.org/browse/MDEV-14580 +Related fixes that broke the RHEL build: +https://github.com/MariaDB/server/commit/9c5be7d131f7eb7f27df722463faa2cd8135fd1b +https://github.com/MariaDB/server/commit/50e593386fcbaa1ca7bd2ed9fdfc51fd5102cdab + +diff -up mariadb-5.5.65/scripts/mysql_install_db.sh.norellocatable mariadb-5.5.65/scripts/mysql_install_db.sh +--- mariadb-5.5.65/scripts/mysql_install_db.sh.norellocatable 2019-08-17 07:06:14.135318451 +0200 ++++ mariadb-5.5.65/scripts/mysql_install_db.sh 2019-08-17 07:10:58.702473136 +0200 +@@ -36,9 +36,6 @@ in_rpm=0 + ip_only=0 + cross_bootstrap=0 + +-dirname0=`dirname $0 2>/dev/null` +-dirname0=`dirname $dirname0 2>/dev/null` +- + usage() + { + cat <<EOF +@@ -243,16 +238,9 @@ then + fi + if test -n "$srcdir" + then +- # In an out-of-source build, builddir is not srcdir. Try to guess where +- # builddir is by looking for my_print_defaults. + if test -z "$builddir" + then +- if test -x "$dirname0/extra/my_print_defaults" +- then +- builddir="$dirname0" +- else +- builddir="$srcdir" +- fi ++ builddir="$srcdir" + fi + print_defaults="$builddir/extra/my_print_defaults" + elif test -n "$basedir" +@@ -263,9 +251,6 @@ then + cannot_find_file my_print_defaults $basedir/bin $basedir/extra + exit 1 + fi +-elif test -n "$dirname0" -a -x "$dirname0/@bindir@/my_print_defaults" +-then +- print_defaults="$dirname0/@bindir@/my_print_defaults" + else + print_defaults="@bindir@/my_print_defaults" + fi +@@ -317,19 +302,11 @@ then + cannot_find_file fill_help_tables.sql @pkgdata_locations@ + exit 1 + fi +-# relative from where the script was run for a relocatable install +-elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld" +-then +- basedir="$dirname0" +- bindir="$basedir/@INSTALL_SBINDIR@" +- resolveip="$bindir/resolveip" +- mysqld="$basedir/@INSTALL_SBINDIR@/mysqld" +- pkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" + else + basedir="@prefix@" + bindir="@bindir@" + resolveip="$bindir/resolveip" +- mysqld="@sbindir@/mysqld" ++ mysqld="@libexecdir@/mysqld" + pkgdatadir="@pkgdatadir@" + fi + diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index df2125f..5984a64 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -3,7 +3,7 @@ %bcond_with tokudb Name: mariadb -Version: 5.5.64 +Version: 5.5.65 Release: 1%{?dist} Epoch: 1 @@ -51,6 +51,7 @@ Patch14: mariadb-basedir.patch Patch17: mariadb-covscan-signexpr.patch Patch18: mariadb-covscan-stroverflow.patch Patch20: mariadb-mysql_secure_installation.patch +Patch21: mariadb-norelocatable.patch BuildRequires: perl, readline-devel, openssl-devel BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel @@ -193,11 +194,13 @@ MariaDB is a community developed branch of MySQL. Summary: The test suite distributed with MariaD Group: Applications/Databases +BuildRequires: openssl Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release} Requires: perl(Socket), perl(Time::HiRes) Requires: perl(Data::Dumper), perl(Test::More), perl(Env) +Requires: openssl Obsoletes: mysql-test < %{obsoleted_mysql_evr} %description test @@ -223,6 +226,7 @@ MariaDB is a community developed branch of MySQL. %patch17 -p1 %patch18 -p1 %patch20 -p1 +%patch21 -p1 # workaround for upstream bug #56342 rm -f mysql-test/t/ssl_8k_key-master.opt @@ -727,6 +731,16 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Sat Aug 17 2019 Honza Horak <hhorak@redhat.com> - 1:5.5.65-1 +- Rebase to 5.5.65 + Also fixes: + CVE-2019-2737 CVE-2019-2739 CVE-2019-2740 CVE-2019-2805 + Resolves: #1741357 +- Revert upstream changes that make the mysql_install_db relocatable + because it broke mysql_install_db when run without --rpm arg + Resolves: #1731062 +- Add openssl BR that was missing for the tests + * Thu May 02 2019 Michal Schorm <mschorm@redhat.com> - 1:5.5.64-1 - Rebase to 5.5.64 - Resolves: #1490398