| Message ID | 20201230021128.17080-1-mingli.yu@windriver.com |
|---|---|
| State | Superseded |
| Commit | 18ccca3bbc0c771a85bc5ca90e60dcc52ba9942d |
| Headers | show |
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.8.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.8.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index e3ce29761..5631f041b 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -21,7 +21,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://0001-Fix-library-LZ4-lookup.patch \ file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ " -SRC_URI[sha256sum] = "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4" +SRC_URI[sha256sum] = "eb4824f6f2c532cd3fc6a6bce7bf78ea7c6b949f8bdd07656b2c84344e757be8" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch index 36217f9aa..32c9818ab 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch @@ -17,10 +17,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configure.cmake b/configure.cmake -index a355214..6ee595f 100644 +index bb3ad43..2ff4f19 100644 --- a/configure.cmake +++ b/configure.cmake -@@ -865,7 +865,25 @@ int main() +@@ -861,7 +861,25 @@ int main() long long int *ptr= &var; return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); }" @@ -48,11 +48,11 @@ index a355214..6ee595f 100644 IF(WITH_VALGRIND) SET(HAVE_valgrind 1) diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt -index 3d8a20e..42f1441 100644 +index 6a3a1ef..e306ae7 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -129,6 +129,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO}) +@@ -140,6 +140,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} + ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) DTRACE_INSTRUMENT(mysys) +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) @@ -63,10 +63,10 @@ index 3d8a20e..42f1441 100644 TARGET_LINK_LIBRARIES(mysys bfd) ENDIF(HAVE_BFD_H) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index 616017b..53575f6 100644 +index 4978d01..883a930 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -219,6 +219,10 @@ ELSE() +@@ -220,6 +220,10 @@ ELSE() SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) ENDIF() diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb
fails on musl see https://errors.yoctoproject.org/Errors/Details/540392/ On Tue, Dec 29, 2020 at 6:12 PM Yu, Mingli <mingli.yu@windriver.com> wrote: > > From: Mingli Yu <mingli.yu@windriver.com> > > Fixes for the following security vulnerabilities: > CVE-2020-14812 > CVE-2020-14765 > CVE-2020-14776 > CVE-2020-14789 > CVE-2020-28912 (MDEV-24040) > > Rebase c11_atomics.patch to avoid fuzz warnings > > Signed-off-by: Mingli Yu <mingli.yu@windriver.com> > --- > ...b-native_10.5.6.bb => mariadb-native_10.5.8.bb} | 0 > meta-oe/recipes-dbs/mysql/mariadb.inc | 2 +- > .../recipes-dbs/mysql/mariadb/c11_atomics.patch | 14 +++++++------- > .../mysql/{mariadb_10.5.6.bb => mariadb_10.5.8.bb} | 0 > 4 files changed, 8 insertions(+), 8 deletions(-) > rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.6.bb => mariadb-native_10.5.8.bb} (100%) > rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.6.bb => mariadb_10.5.8.bb} (100%) > > diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.8.bb > similarity index 100% > rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb > rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.8.bb > diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc > index e3ce29761..5631f041b 100644 > --- a/meta-oe/recipes-dbs/mysql/mariadb.inc > +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc > @@ -21,7 +21,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz > file://0001-Fix-library-LZ4-lookup.patch \ > file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ > " > -SRC_URI[sha256sum] = "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4" > +SRC_URI[sha256sum] = "eb4824f6f2c532cd3fc6a6bce7bf78ea7c6b949f8bdd07656b2c84344e757be8" > > UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" > > diff --git a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch > index 36217f9aa..32c9818ab 100644 > --- a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch > +++ b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch > @@ -17,10 +17,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> > 3 files changed, 27 insertions(+), 1 deletion(-) > > diff --git a/configure.cmake b/configure.cmake > -index a355214..6ee595f 100644 > +index bb3ad43..2ff4f19 100644 > --- a/configure.cmake > +++ b/configure.cmake > -@@ -865,7 +865,25 @@ int main() > +@@ -861,7 +861,25 @@ int main() > long long int *ptr= &var; > return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); > }" > @@ -48,11 +48,11 @@ index a355214..6ee595f 100644 > IF(WITH_VALGRIND) > SET(HAVE_valgrind 1) > diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt > -index 3d8a20e..42f1441 100644 > +index 6a3a1ef..e306ae7 100644 > --- a/mysys/CMakeLists.txt > +++ b/mysys/CMakeLists.txt > -@@ -129,6 +129,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} > - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO}) > +@@ -140,6 +140,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} > + ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) > DTRACE_INSTRUMENT(mysys) > > +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) > @@ -63,10 +63,10 @@ index 3d8a20e..42f1441 100644 > TARGET_LINK_LIBRARIES(mysys bfd) > ENDIF(HAVE_BFD_H) > diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt > -index 616017b..53575f6 100644 > +index 4978d01..883a930 100644 > --- a/sql/CMakeLists.txt > +++ b/sql/CMakeLists.txt > -@@ -219,6 +219,10 @@ ELSE() > +@@ -220,6 +220,10 @@ ELSE() > SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) > ENDIF() > > diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb > similarity index 100% > rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb > rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb > -- > 2.26.2 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88440): https://lists.openembedded.org/g/openembedded-devel/message/88440 Mute This Topic: https://lists.openembedded.org/mt/79305347/3617530 Group Owner: openembedded-devel+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org] -=-=-=-=-=-=-=-=-=-=-=-
This is a system generated Comment: Patch 179086 was automatically marked as superseded by patch 179261.