Update lambda2/mariadb to 1:5.5.68

lambci · Oct 30, 2020 · 233cc26 · 233cc26
1 parent 06bc5c8
commit 233cc26
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/amazon-linux-2/build/specs/lambda2/mariadb.spec b/amazon-linux-2/build/specs/lambda2/mariadb.spec
@@ -3,7 +3,7 @@
 %bcond_with tokudb
 
 Name: mariadb
-Version: 5.5.64
+Version: 5.5.68
 Release: 1%{?dist}
 Epoch: 1
 
@@ -51,6 +51,8 @@ Patch14: mariadb-basedir.patch
 Patch17: mariadb-covscan-signexpr.patch
 Patch18: mariadb-covscan-stroverflow.patch
 Patch20: mariadb-mysql_secure_installation.patch
+Patch21: mariadb-norelocatable.patch
+Patch22: mariadb-client-memory-leak.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -155,6 +157,8 @@ MariaDB is a community developed branch of MySQL.
 %patch17 -p1
 %patch18 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -524,9 +528,39 @@ fi
 
 
 %changelog
-* Wed May 15 2019 Michael Hart <[email protected]>
+* Thu Oct 29 2020 Michael Hart <[email protected]>
 - recompiled for AWS Lambda (Amazon Linux 2) with prefix /opt
 
+* Wed May 13 2020 Michal Schorm <[email protected]> - 1:5.5.68-1
+- Rebase to 5.5.68
+  This is the last upstream release. This major version reached upstream EOL
+- Related to: rhbz#1834835
+
+* Thu Mar 26 2020 Lukas Javorsky <[email protected]> - 1:5.5.67-2
+- Resolves: rhbz#1689827
+
+* Tue Feb 25 2020 Michal Schorm <[email protected]> - 1:5.5.67-1
+- Rebase to 5.5.67
+- Related to: rhbz#1834835
+- CVE's fixed: rhbz#1821939
+  CVE-2020-2574
+
+* Mon Nov 18 2019 Michal Schorm <[email protected]> - 1:5.5.66-1
+- Rebase to 5.5.66
+- Related to: rhbz#1834835
+- CVE's fixed: rhbz#1769276 rhbz#1830110
+  CVE-2019-2974 CVE-2020-2780
+
+* Sat Aug 17 2019 Honza Horak <[email protected]> - 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 <[email protected]> - 1:5.5.64-1
 - Rebase to 5.5.64
 - Resolves: #1490398

diff --git a/amazon-linux-2/packages.txt b/amazon-linux-2/packages.txt
@@ -454,10 +454,10 @@ m4.x86_64                          1.4.16-10.lambda2.0.2                 lambda2
 mailcap.noarch                     2.1.41-2.lambda2                      lambda2
 make.x86_64                        1:3.82-24.lambda2                     lambda2
 malaga-suomi-voikko.x86_64         1.12-5.lambda2.0.2                    lambda2
-mariadb.x86_64                     1:5.5.64-1.lambda2                    lambda2
-mariadb-embedded.x86_64            1:5.5.64-1.lambda2                    lambda2
-mariadb-libs.x86_64                1:5.5.64-1.lambda2                    lambda2
-mariadb-server.x86_64              1:5.5.64-1.lambda2                    lambda2
+mariadb.x86_64                     1:5.5.68-1.lambda2                    lambda2
+mariadb-embedded.x86_64            1:5.5.68-1.lambda2                    lambda2
+mariadb-libs.x86_64                1:5.5.68-1.lambda2                    lambda2
+mariadb-server.x86_64              1:5.5.68-1.lambda2                    lambda2
 matio.x86_64                       1.5.17-3.lambda2                      lambda2
 memcached.x86_64                   1.5.17-1.lambda2.0.1                  lambda2
 mesa-dri-drivers.x86_64            17.2.3-8.20171019.lambda2.0.4         lambda2