diff options
| author |   Mingli Yu <mingli.yu@windriver.com> | 2020-04-10 09:43:16 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-04-09 21:05:59 -0700 |
| commit | 9cfdcdda1b0018a0e6c386f8ce18d2cc806cc147 (patch) | |
| tree | 6477e06104659c3503b1384a4950eb14820429b5 /meta-oe/recipes-dbs/mysql/mariadb.inc | |
| parent | 681555bf55ae02c6efaf4fd3e65c53dda1095131 (diff) | |
| download | meta-openembedded-9cfdcdda1b0018a0e6c386f8ce18d2cc806cc147.tar.gz | |
mariadb: Upgrade to 10.4.12
* Fixes for the following security vulnerabilities:
CVE-2020-2574
CVE-2020-7221
* Rework fix-arm-atomic.patch to remove fuzz warnings
* Fix the warning when pam is enabled in DISTRO_FEATURES:
WARNING: mariadb-10.4.12-r0 do_package_qa: QA Issue: mariadb-dbg: found library in wrong location: /lib/security/.debug/pam_user_map.so
mariadb-leftovers: found library in wrong location: /lib/security/pam_user_map.so [libdir]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb.inc')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 6888c64e3d..5ff273ec27 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -21,8 +21,8 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \ file://0001-Fix-library-LZ4-lookup.patch \ " -SRC_URI[md5sum] = "d0de881ab8ead46928cafb7d558535c1" -SRC_URI[sha256sum] = "4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9" +SRC_URI[md5sum] = "97d7c0f508c04a31c138fdb24e95dbc4" +SRC_URI[sha256sum] = "fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -168,6 +168,9 @@ do_install() { if [ -f ${D}${datadir}/doc/README ]; then mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + mv ${D}/lib/security ${D}/${libdir} + fi } PACKAGES = "${PN}-dbg ${PN} \ @@ -299,12 +302,14 @@ FILES_${PN}-server = "\ ${sbindir}/ndbd \ ${sbindir}/ndb_mgmd \ ${libdir}/plugin/*.so \ + ${libdir}/security/*.so \ ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \ ${datadir}/mysql/ \ ${localstatedir}/mysql/ \ ${sysconfdir}/init.d/mysqld \ ${sysconfdir}/my.cnf \ ${sysconfdir}/my.cnf.d/server.cnf \ + ${sysconfdir}/security/user_map.conf \ ${sysconfdir}/tmpfiles.d" DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" |