From 40c756f457979c31f790ecace2edcb2ecd747b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Fri, 2 Aug 2019 18:14:40 +0100 Subject: [PATCH] Update changelog and refresh patches after 10.1.41 import --- debian/changelog | 11 +++++++++++ debian/patches/c11_atomics.patch | 4 ++-- debian/patches/kFreeBSD-gettid.patch | 2 +- debian/patches/mips-connect-unaligned.patch | 2 +- debian/patches/mysql-test__db_test.patch | 2 +- .../remove_rename_mariadb-server_files_in.patch | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2f39a102..dbb038b27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +mariadb-10.1 (1:10.1.41-0ubuntu0.18.04.1) bionic-security; urgency=medium + + * SECURITY UPDATE: New upstream version 10.1.41. Includes fixes for the + following security vulnerabilities (LP: #1837770): + - CVE-2019-2737 + - CVE-2019-2739 + - CVE-2019-2740 + - CVE-2019-2805 + + -- Otto Kekäläinen Fri, 02 Aug 2019 18:10:23 +0100 + mariadb-10.1 (1:10.1.40-0ubuntu0.18.04.1) bionic-security; urgency=medium * SECURITY UPDATE: New upstream version 10.1.40. Includes previous diff --git a/debian/patches/c11_atomics.patch b/debian/patches/c11_atomics.patch index 6c3649f05..f58c9b009 100644 --- a/debian/patches/c11_atomics.patch +++ b/debian/patches/c11_atomics.patch @@ -53,7 +53,7 @@ Subject: c11_atomics +++ b/include/atomic/gcc_builtins.h @@ -16,6 +16,7 @@ along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ +#if defined (HAVE_GCC_ATOMIC_BUILTINS) #define make_atomic_add_body(S) \ @@ -83,7 +83,7 @@ Subject: c11_atomics --- a/include/atomic/nolock.h +++ b/include/atomic/nolock.h @@ -17,7 +17,7 @@ - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \ - || defined(HAVE_GCC_ATOMIC_BUILTINS) \ diff --git a/debian/patches/kFreeBSD-gettid.patch b/debian/patches/kFreeBSD-gettid.patch index cd6b23166..db28aa48f 100644 --- a/debian/patches/kFreeBSD-gettid.patch +++ b/debian/patches/kFreeBSD-gettid.patch @@ -8,7 +8,7 @@ Subject: kFreeBSD-gettid --- a/storage/tokudb/PerconaFT/portability/portability.cc +++ b/storage/tokudb/PerconaFT/portability/portability.cc -@@ -118,6 +118,10 @@ toku_os_gettid(void) { +@@ -120,6 +120,10 @@ toku_os_gettid(void) { return syscall(SYS_gettid); #elif defined(HAVE_PTHREAD_GETTHREADID_NP) return pthread_getthreadid_np(); diff --git a/debian/patches/mips-connect-unaligned.patch b/debian/patches/mips-connect-unaligned.patch index 69d491ba8..a47034a67 100644 --- a/debian/patches/mips-connect-unaligned.patch +++ b/debian/patches/mips-connect-unaligned.patch @@ -95,7 +95,7 @@ Subject: mips-connect-unaligned CheckType(pv) TYPE *lp = ((TYPBLK*)pv)->Typp; -- for (register int i = k; i < n; i++) // TODO +- for (int i = k; i < n; i++) // TODO - Typp[i] = lp[i]; + memcpy(Typp + k, lp + k, sizeof(TYPE) * n); diff --git a/debian/patches/mysql-test__db_test.patch b/debian/patches/mysql-test__db_test.patch index a7fb43e6e..191ceb0ab 100644 --- a/debian/patches/mysql-test__db_test.patch +++ b/debian/patches/mysql-test__db_test.patch @@ -14,7 +14,7 @@ Subject: mysql-test__db_test --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl -@@ -3227,6 +3227,10 @@ sub mysql_install_db { +@@ -3230,6 +3230,10 @@ sub mysql_install_db { mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", $bootstrap_sql_file); diff --git a/debian/patches/remove_rename_mariadb-server_files_in.patch b/debian/patches/remove_rename_mariadb-server_files_in.patch index f5df84139..7b25aa3f0 100644 --- a/debian/patches/remove_rename_mariadb-server_files_in.patch +++ b/debian/patches/remove_rename_mariadb-server_files_in.patch @@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -465,12 +465,6 @@ CONFIGURE_FILE( +@@ -467,12 +467,6 @@ CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) -- GitLab