From 16e19df2b4df49dc30578d9f825f731d64a671ff Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 10 Dec 2018 13:21:07 +0100 Subject: [PATCH] Rebase to 10.3.11 --- mariadb.spec | 12 ++++++++++-- sources | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 18254fb..6798061 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -142,7 +142,7 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.3.10 +Version: 10.3.11 Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 @@ -861,7 +861,8 @@ fi # Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340 # TODO: check, if it changes location inside that file depending on values passed to Cmake mkdir -p %{buildroot}/%{_libdir}/pkgconfig -mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig +mv %{buildroot}/%{_datadir}/pkgconfig/mariadb.pc %{buildroot}/%{_libdir}/pkgconfig +rm %{buildroot}/usr/lib/pkgconfig/libmariadb.pc # install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files, # but that's pretty wacko --- see also %%{name}-file-contents.patch) @@ -1560,6 +1561,13 @@ fi %endif %changelog +* Mon Dec 10 2018 Michal Schorm - 3:10.3.11-1 +- Rebase to 10.3.11 +- CVEs fixed: + CVE-2018-3282, CVE-2016-9843, CVE-2018-3174, CVE-2018-3143, CVE-2018-3156 + CVE-2018-3251, CVE-2018-3185, CVE-2018-3277, CVE-2018-3162, CVE-2018-3173 + CVE-2018-3200, CVE-2018-3284 + * Fri Oct 05 2018 Michal Schorm - 3:10.3.10-1 - Rebase to 10.3.10 diff --git a/sources b/sources index 3cf2c1c..d49a3e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.3.10.tar.gz) = dee7789dff359a6352ceacb2db6bcb4730940e9458adda4e23894f9bfa0a7ff8c238060bffca58a60b662275e52a31ea1784d51fae114312b003c024e9412b31 +SHA512 (mariadb-10.3.11.tar.gz) = 1adc1f9bbabf848726c669a7a0ab01257ba31882758b53fbf3b1316f2295670dba1c3d1f3292d7c1a749c701504588694a55d020839e690595897b0e20435298