meta-openembedded: subtree update:459dbf1078..ea8604a0e3

Adrian Bunk (6):
      xfsprogs: Remove obsolete patch
      gpsd: Add a PACKAGECONFIG for disabling usb support
      libqmi: Upgrade 1.24.0 -> 1.24.2
      enchant2: Upgrade 2.2.3 -> 2.2.7
      geany-plugins: Use enchant2 instead of the old enchant
      enchant2: Remove, moved to oe-core

Alex Kiernan (11):
      nftables: Fix documentation generation
      ldns: Add recipe
      ostree: Fix DISTRO_FEATURES with ptest but w/o xattr
      ostree: Drop tests for soup/xattr with ptest
      ostree: Change PACKAGECONFIG to use manpages
      ostree: Add PACKAGECONFIG for builtin-grub2-mkconfig
      ostree: Backport build/test fixes from upstream
      ostree: Upgrade 2019.5 -> 2019.6
      ostree: Add support for gjs tests
      nftables: Expand PACKAGECONFIG, cleanup build
      ostree: Tidy FILES_${PN} using PACKAGE_BEFORE_PN

Alexander Kanavin (1):
      enscript/indent/sharutils: fix build with gettext 0.20.x

Alistair Francis (2):
      mycroft: RDEPENDS on mpg123 to allow singing
      openocd: Enable remote-bitbang build option

Andreas Müller (76):
      gnome-system-monitor: add gsettings to inherit
      tracker-miners: initial add 2.3.1
      nautilus: add tracker-miners to RDPENDS
      libgnomekbd: cleanup DEPENDS inherit gsettings / remove unused config
      nodejs: Add PACKAGECONFIG share to allow other projects to use node as library
      xserver-xorg-cvt-native: initial add 1.20.5
      mutter: initial add 3.34.1
      pinpoint: remove dead project
      gnome-keyring: upgrade 3.28.2 -> 3.34.0
      libgsf: upgrade 1.14.45 -> 1.14.46
      libgnome-keyring: remove
      gvfs: upgrade 1.41.2 -> 1.42.1
      grilo: initial add 0.3.10
      gsound: initial add 1.0.2
      gnome-backgrounds: initial add 3.34.0
      metacity: upgrade 3.32.0 -> 3.34.1
      gjs: initial add 1.58.3
      gdm: re-add 3.34.1
      gnome-shell: initial add 3.34.1
      gnome-shell-extensions: initial add 3.34.1
      accountsservice: initial add 0.6.55
      rest: initial add 0.8.1
      gnome-online-accounts: initial add 3.34.1
      gnome-control-center: re-add 3.34.1
      gnome-session: inital add 3.34.1
      gnome-panel: (re)add 3.34.1
      gnome-flashback: initial add 3.34.1
      Add: packagegroup-gnome-apps / packagegroup-gnome-desktop
      glfw: add features_check to inherit
      stalonetray: Add x11 to required distro feature
      projucer: add x11 to required distro features
      colord-gtk: add polkit to required distro features
      yelp: add x11 to required distro features
      file-roller: remove nautilus from DEPENDS
      libgdata: add x11 to required distro features
      accountsservice: Hack musl build fix
      accountsservice: fix build for systemd not in DISTRO_FEATURES
      gnome-font-viewer: fix copy & paste typo in SUMMARY
      libxfce4ui: give up glade3 (=glade for gtk2) support
      glade3: remove ancient version of glade
      exo: remove pythonnative from inherit
      geany: remove pythonnative from inherit
      gnome-tweaks: initial add 3.34.0
      libhandy: initial add 0.0.12
      fluidsynth: upgrade 2.0.9 -> 2.1.0
      exo: upgrade 0.12.10 -> 0.12.11
      tumbler: upgrade 0.2.7 -> 0.2.8
      catfish: upgrade 1.4.10 -> 1.4.11
      cppunit: upgrade 1.14.0 -> 1.15.1
      xfce4-terminal: upgrade 0.8.8 -> 0.8.9
      gnome-calculator: initial add 3.34.1
      evince: upgrade 3.34.1 -> 3.34.1
      file-roller: upgrade 3.32.2 -> 3.32.3
      evolution-data-server: upgrade 3.34.1 -> 3.34.2
      gedit: upgrade 3.34.0 -> 3.34.1
      gnome-autoar: upgrade 0.2.3 -> 0.2.4
      gnome-control-center: upgrade 3.34.1 -> 3.34.2
      gnome-desktop3: upgrade 3.34.1 -> 3.34.2
      gnome-flashback: upgrade 3.34.1 -> 3.34.2
      gnome-session: 3.34.1 -> 3.34.2
      gnome-settings-daemon: upgrade 3.34.1 -> 3.34.2
      gnome-shell-extensions: upgrade 3.34.1 -> 3.34.2
      gnome-shell: upgrade 3.34.1 -> 3.34.2
      gvfs: upgrade 1.42.1 -> 1.42.2
      libgdata: upgrade 0.17.10 -> 0.17.11
      mutter: upgrade 3.34.1 -> 3.34.2
      nautilus: upgrade 3.34.1 -> 3.34.2
      yelp-xsl: upgrade 3.34.0 -> 3.34.2
      poppler: upgrade 0.82.0 -> 0.84.0
      xfce4-terminal: upgrade 0.8.9 -> 0.8.9.1
      mutter: upgrade 3.34.2 -> 3.34.3
      gnome-shell: upgrade 3.34.2 -> 3.34.3
      evolution-data-server: upgrade 3.34.2 -> 3.34.3
      gjs: upgrade 1.58.3 -> 1.58.4
      gnome-desktop3: upgrade 3.34.2 -> 3.34.3
      libsigc++-3: let meson build

Andrei Gherzan (1):
      kernel-selftest: Include rtc tests

Andrej Valek (1):
      ntp: split ntpdc into separate package

Andrey Zhizhikin (1):
      flatbuffers: add PIC compiler flag required for aarch64

André Draszik (4):
      python3-jsonrpcserver: update to v4.1.0
      python3-jsonrpcserver: allow to use as non-root
      oniguruma: update to v6.9.4
      oniguruma: enable ptest

Armin Kuster (3):
      glfw: missing feature check.
      libvncserver: fix build depends issue
      surf: Add opengl requirement

Bartosz Golaszewski (10):
      librsync: new package
      xdelta3: update to v3.1.0
      xdelta3: add native and nativesdk to BBCLASSEXTEND
      speedtest-cli: new package
      doxygen: upgrade v1.8.16 -> v1.8.17
      libsigrok: upgrade v0.5.1 -> v0.5.2
      libsigrokdecode: upgrade v0.5.2 -> v0.5.3
      libsigrok: add support for bluetooth integration
      cloc: new package
      libsigrok: add support for hidapi integration

Changqing Li (5):
      samba: fix wrong shebang for python3
      gtk-xfce-engine: remove this recipe
      xfce4-kbdleds-plugin: remove this recipe
      xfce-dusk-gtk3: correct invalid SRC_URI
      libhugetlbfs: update patch to make it work for python3

Denys Dmytriyenko (1):
      netperf: add "intervals" and "histogram" PACKAGECONFIGs

Diego Rondini (2):
      cups-filters: add recipe
      qpdf: add recipe

Fabio Berton (1):
      nanopb: Add recipe for version 0.4.0

Gianfranco Costamagna (6):
      boinc: update recipe to version 7.16.3
      vboxguestdrivers: update to version 6.1.0 and unblacklist
      websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
      brotli: rename static libraries avoding the -static suffix.
      cpprest: fix cmake installation directory
      websocketpp: also install examples in a new -examples subpackage

Hongxu Jia (2):
      gvfs: add user polkitd and missing depends
      python3-astor: fix VERSION file not found

Jacopo Dall'Aglio (1):
      netplan: add recipe

Jens Rehsack (6):
      log4cplus: update to 2.0.5
      libstatgrab: add logging/tracing options
      libtest-warnings-perl: add recipe
      libfile-slurper-perl: add recipe
      libconfig-autoconf-perl: add recipe
      libunix-statgrab: add recipe

Kai Kang (12):
      blueman: disable appindicator support
      xfce4-panel-profiles: 1.0.8 -> 1.0.9
      exo: 0.12.9 -> 0.12.10
      thunar: 1.8.9 -> 1.8.10
      fltk: fix build error when enable package config examples
      corosync: fix build error when package config rdma enabled
      rdma-core: 18.1 -> 27.0
      openl2tp: update systemd service file
      bdwgc: make libatomic-ops as dependency
      volume-key: not create python2 bindings
      libbytesize: disable doc build
      adduser: set default shell with /sbin/nologin

Khem Raj (113):
      python-evdev: Fix build for 32bit arches with 64bit time_t
      x11vnc: Fix build for 32bit arches with 64bit time_t
      evtest: Fix build for 32bit arches with 64bit time_t
      lirc: Fix build for 32bit arches with 64bit time_t
      v4l-utils: Update to 1.18.0
      tslib: Fix build for 32bit arches with 64bit time_t
      utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit time_t
      directfb: Fix build for 32bit arches with 64bit time_t
      kernel-module-emlog: Use compile task from module bbclass
      emlog: Use RRECOMMEND instead of RDEPEND
      projucer: Upgrade to 5.4.5
      packagegroup-meta-oe: Remove nodejs and uim on riscv
      libnih: Fix build with latest gettext
      liblockdev: Loosen the regexp for py3
      sigrok-cli: Update to 0.7.1
      python-pywbem: Update to 0.15.0
      udisks2: Update to 2.8.4
      id3lib: Update to newer debian patchset
      libdc1394: Update to 2.2.6 release
      libsmi: Use right name for tcl license
      hdf5: Upgrade to 1.8.21
      xterm: Fix latent issue found with musl
      mozjs: extend --with-intl-api=build to all mips
      klibc: Apply -no-integrated-as on mips/clang
      grpc: Define libdir and cmakedir in terms of multilib
      ufs-utils: Renames from ufs-tool
      breakpad: Update to latest upstream
      rsyslog: Sync VALGRIND supported arch list
      packagegroup-meta-oe: Remove ppc64 specific incompatible packages
      libpfm4: Moved here from oe-core
      rdma-core: Replace pthread_yield with sched_yield
      fvwm: Upgrade to 2.6.9
      nlohmann-json: Upgrade to 3.7.3
      libqb: Add --enable-nosection-fallback with mips64/clang
      lcdproc: Upgrade to latest top of tree
      tinyalsa: fix installation libdir path to match multilibs
      luajit: Add ppc/ppc64 to unsupported arch list
      rsyslog: Do not assume atomic built-ins on ppc
      hiredis: Upgrade to 0.14.0
      libfann: Define LIB_SUFFIX suitable for OE multilib needs
      libgit2: Upgrade to 0.28.4
      libinih: Fix multilib build
      poco: Define LIB_SUFFIX per OE multilibs
      libcec: Fix multilib build
      dfu-util-native,sjf2410-linux-native: Fix Deploy in multimachine builds
      mpv: Remove luajit dependency for ppc64
      cannelloni: Update to latest and fix multilib builds
      nvme-cli: Use nonarch libdir for dracut config files
      cli11: Fix multilib build
      lockdev: Make baselib configurable
      avro-c: Update to 1.9.1
      nftables: Package python scripts into nonarch libdir
      mercurial: Add python scripts into separate python package
      fluentbit: Fix packaging in multilib env
      dcadec: Define BASELIB as a knob
      dbus-broker: Use nonarch_libdir for systemd catalog files
      websocketapp: Fix multilib build
      ade: Fix install paths in multilib builds
      thrift: Upgrade to 0.13
      gattlib: Update to latest tip
      rygel: Use nonarch_libdir for systemd units
      firewalld: Package firewalld files
      iwd: Package module conf files via nonarch_libdir
      civetweb: Upgrade to latest tip
      ruli: Define OOP_LIB_DIR and INSTALL_LIB_DIR
      liblightmodbus: Fix packaging errors when using multilib
      ostree: Fix packaging errors when using lib64 libdir
      boinc-client: Use nonarch_libdir for systemd_units
      spirv-tools: Fix multilib builds
      pam-plugin-ldapdb: Include <stdexcept> for std::invalid_argument
      dvb-apps: Replace stime with clock_settime
      redis: Upgrade to 5.0.7
      cannelloni: Include stdexcept for runtime_error
      libubox: Update to latest
      upm: Fix 'may be used uninitialized' errors
      memcached: upgrade to 1.5.20
      ltrace: Fix build with gcc10
      mpd: Fix build with gcc10
      wvstreams: Fix build with gcc10
      tvheadend: Fix format-truncation warnings
      open-vm-tools: Ignore -Warray-bounds
      jsoncpp: Upgrade to 1.9.2
      ippool: Fix strncpy -Wformat-truncation warning
      opensc: Fix misaligned indentation
      glm: Upgrade to 0.9.9.6
      rocksdb: Upgrade to 6.5.2
      mariadb: Upgrade to 10.4.11
      ruli: Fix implicit conversion from 'unsigned int' to 'float'
      glfw: Update to latest
      fluentbit: Upgrade to 1.3.5
      renderdoc: Upgrade to 1.5
      spirv-tools: Upgrade to v2019.5
      upm: Disable -Wno-misleading-indentation with clang10+
      libyui: Disable Warnings as errors
      sanlock: Upgrade to 3.8.0+
      udisks2: Updare to latest master beyond 2.8.4
      netcat: Fix build with gettext 0.20.x
      gtkperf: Fix build with latest gettext 0.20.x
      hddtemp: Fix build with latest gettext 0.20.x
      vorbis-tools: Use external gettext
      rwmem: Upgrade to latest
      wireshark: Enable plugins when enabling qt5
      python3-jsonrpcserver: Use PYTHON_BASEVERSION instead of hardcoding py version
      smbnetfs: Update to latest 0.6.2 rev
      makedumpfile: Drop linking with libebl
      cmpi-bindings: append PYTHON_ABI suffix to libpython soname
      websocketpp: Fix clang specific flags in cmake files
      rocksdb: Disable Werror
      spirv-tools: Disable Werror
      libspatialite: Workaround proj_api.h deprecation in proj 6.0.0
      zbar: Switch to github and update to latest
      gstd: Upgrade to 0.8.1
      gst-shark: Upgrade to 0.6.1

Laurent Bonnans (1):
      opensc: fix RDEPENDS in pcsc PACKAGECONFIG

Leon Anavi (1):
      mosquitto: update to 1.6.8

Martin Jansa (2):
      googletest: fix build with newer oe-core without python in HOSTTOOLS
      proj: upgrade to 6.2.0

Max Krummenacher (1):
      libsoc: use python3 for python bindings

Maxime Roussin-Bélanger (1):
      libvncserver: add missing cmake configration option to packageconfig

Mingde (Matthew) Zeng (1):
      poppler/poppler-data: Add HOMEPAGE tags

Nicola Lunghi (1):
      python3-jsonrpcserver: update to 4.1.2

Pau Espin Pedrol (1):
      lksctp-tools: Add RRECOMENDS kernel-module-sctp for pkg lksctp-tools

Peter Kolbus (9):
      python(3)-ujson: extend to native(sdk)
      python-ipaddress: remove unneeded pip dependency
      python3-html2text: add recipe
      python(3)-beautifulsoup4: fix RDEPENDS
      python3-soupsieve: add recipe
      python-soupsieve: add recipe
      python(3)-beautifulsoup4: add soupsieve to RDEPENDS
      python3-booleanpy: add recipe
      python3-license-expression: add recipe

Pierre-Jean Texier (3):
      libssh2: add nativesdk support
      python3-xmltodict: add recipe
      libmxml: upgrade 3.0 -> 3.1

Quanyang Wang (1):
      glog: fix do_fetch error

Randy MacLeod (3):
      imagemagick: update from 7.8.47 to 7.9.16
      tigervnc: update from 1.9.0 to 1.10.1
      rsyslog: update from 8.1910 to 8.1911

Robert Yang (1):
      rocksdb: Fix compile error for DEBUG_BUILD

Ross Burton (11):
      python-jsonpointer: enable native/nativesdk
      python3-pystemd: upgrade to 0.7.0
      python-slip-dbus: don't use relative paths
      python-m2crypto: don't use relative paths
      python-coloredlogs: don't use relative paths
      python-lxml: remove redundant sed (fixed in 4.3.0 onwards)
      python-lxml: remove redundant RDEPENDS_class-native
      opencv: don't download during configure
      opencv: also download face alignment data in do_fetch()
      opencv: PACKAGECONFIG for G-API, use system ADE
      opencv: abort configure if we need to download

Stefan Agner (1):
      Revert "zstd: move recipe to oe-core"

Stefan Lendl (2):
      tinyproxy: Install a default tinyproxy.conf
      tinyproxy: Fix user and group in tinyproxy install

Sumit Garg (1):
      mariadb: fix library LZ4 lookup

Todd Cunningham (2):
      libnftnl: upgrade 1.1.4 -> 1.1.5
      nftables: upgrade 0.9.2 -> 0.9.3

Trevor Gamblin (4):
      python-twisted: add python3-pyserial to RDEPENDS
      python-twisted: add missing RDEPENDS for conch
      samba: disable guest access and anonymous queries
      python3-twisted: fix broken MemoryReactor import

Wang Mingyu (66):
      python-cmd2: upgrade 0.9.19 -> 0.9.21
      python-pluggy: upgrade 0.13.0 -> 0.13.1
      python-pyasn1: upgrade 0.4.7 -> 0.4.8
      python-pyopenssl: upgrade 19.0.0 -> 19.1.0
      python-simplejson: upgrade 3.16.0 -> 3.17.0
      python-thrift: upgrade 0.11.0 -> 0.13.0
      python-alembic: upgrade 1.3.0 -> 1.3.1
      python-dbus: upgrade 1.2.12 -> 1.2.14
      python-pbr: upgrade 5.4.3 -> 5.4.4
      python-paste: 3.2.2 -> 3.2.3
      python-lxml: 4.4.1 -> 4.4.2
      postgresql: 12.0 -> 12.1
      python-jsonschema: 3.1.1 -> 3.2.0
      python-pytest: upgrade 5.2.2 -> 5.3.1
      xterm: upgrade 350 -> 351
      wireshark: upgrade 3.0.6 -> 3.0.7
      python3-xxhash: upgrade 1.4.2 -> 1.4.3
      fuse3: upgrade 3.8.0 -> 3.9.0
      kea: upgrade 1.7.0 -> 1.7.2
      krb5: upgrade 1.17 -> 1.17.1
      hwdata: upgrade 0.329 -> 0.330
      python-pytest: upgrade 5.2.1 -> 5.3.2
      python-waitress: upgrade 1.3.1 -> 1.4.1
      python-cachetools: upgrade 3.1.1 -> 4.0.0
      python-sqlalchemy: upgrade 1.1.17 -> 1.3.12
      strongswan: upgrade 5.8.1 -> 5.8.2
      smartmontools: upgrade 7.0 -> 7.1
      spitools: upgrade 0.8.3 -> 0.8.4
      python-pyyaml: upgrade 5.1.2 -> 5.2
      arno-iptables-firewall: upgrade 2.0.3 -> 2.1.0
      ipvsadm: upgrade 1.30 -> 1.31
      lftp: upgrade 4.8.4 -> 4.9.0
      nghttp2: upgrade 1.39.2 -> 1.40.0
      opensaf: upgrade 5.19.07 -> 5.19.10
      wolfssl: upgrade 4.2.0 -> 4.3.0
      kea: upgrade 1.7.2 -> 1.7.3
      wireshark: upgrade 3.0.7 -> 3.2.0
      botan: upgrade 2.11.0 -> 2.13.0
      cppzmq: upgrade 4.4.1 -> 4.5.0
      iozone3: upgrade 487 -> 488
      libmbim: upgrade 1.20.2 -> 1.20.4
      libnfc: upgrade to 1.7.1
      libsigc++-2.0: upgrade 3.0.0 -> 3.0.2
      libuv: upgrade 1.33.1 -> 1.34.0
      phoronix-test-suite: upgrade 9.0.1 -> 9.2.1
      rabbitmq-c: upgrade 0.9.0 -> 0.10.0
      cscope: upgrade 15.8b -> 15.9
      msgpack-c: upgrade 3.1.1 -> 3.2.1
      gnuplot: upgrade 5.2.2 -> 5.2.8
      gphoto2: upgrade 2.5.14 -> 2.5.23
      gtkwave: upgrade 3.3.102 -> 3.3.103
      haveged: upgrade 1.9.6 -> 1.9.8
      libgphoto2: upgrade 2.5.17 -> 2.5.23
      libplist: upgrade 2.0.0 -> 2.1.0
      ipmiutil: upgrade 3.0.5 -> 3.1.5
      libburn: upgrade 1.5.0 -> 1.5.2
      libdvdread: upgrade 6.0.1 -> 6.0.2
      libsdl2-image: upgrade 2.0.3 -> 2.0.5
      libsdl2-mixer: upgrade 2.0.2 -> 2.0.4
      libsdl2-ttf: upgrade 2.0.14 -> 2.0.15
      yad: upgrade 4.1 -> 5.0
      python3-astor: 0.8 -> 0.8.1
      python3-bandit: 1.5.1 -> 1.6.2
      python-asn1crypto: 1.2.0 -> 1.3.0
      python-bitarray: 1.2.0 -> 1.2.1
      python-pyconnman: 0.1.0 -> 0.2.0

William A. Kennington III via Openembedded-devel (1):
      stunnel: bump to version 5.56

Yi Zhao (4):
      phpmyadmin: upgrade 4.9.1 -> 4.9.2
      tk: upgrade 8.6.9 -> 8.6.10
      ntp: restrict NTP mode 6 queries
      samba: upgrade 4.10.10 -> 4.10.11

Yongxin Liu (1):
      ndctl: Upgrade to v67

Zang Ruochen (17):
      python-alembic: upgrade 1.3.1 -> 1.3.2
      python-beautifulsoup4: upgrade 4.8.1 -> 4.8.2
      python-bitarray: upgrade 1.1.0 -> 1.2.0
      python-certifi: upgrade 2019.9.11 -> 2019.11.28
      python-cmd2: upgrade 0.9.21 -> 0.9.22
      python-engineio: upgrade 3.10.0 -> 3.11.1
      python-parse: upgrade 1.12.1 -> 1.14.0
      python-passlib: upgrade 1.7.1 -> 1.7.2
      python-pexpect: upgrade 4.6.0 -> 4.7.0
      python-psutil: upgrade 5.6.5 -> 5.6.7
      python-py: upgrade 1.8.0 -> 1.8.1
      python-pycryptodome: upgrade 3.9.3 -> 3.9.4
      python-pymisp: upgrade 2.4.117.2 -> 2.4.119.1
      python-pymongo: upgrade 3.9.0 -> 3.10.0
      python-pyparsing: upgrade 2.4.5 -> 2.4.6
      python-pyperf: upgrade 1.6.1 -> 1.7.0
      python-backports-functools-lru-cache: Add python3 version

Zhixiong Chi (1):
      dnsmasq: CVE-2019-14834

hmenn (1):
      add sqlite-orm v1.5

madhavank27 (1):
      Added bb file for libcamera integration

sangelovic (1):
      sdbus-c++: Introduce recipes for sdbus-c++ library and its tools

Change-Id: I5e7559de35d61167e234161ffb768f6f95d30f41
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.11.bb
similarity index 100%
rename from meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.11.bb
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
index ec5ac11..23de69d 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -4,7 +4,7 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b1becf0cfa3366e0f4d854d1d264f311"
 
-SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
+SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz \
            file://my.cnf \
            file://mysqld.service \
            file://install_db.service \
@@ -18,9 +18,11 @@
            file://c11_atomics.patch \
            file://clang_version_header_conflict.patch \
            file://fix-arm-atomic.patch \
+           file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \
+           file://0001-Fix-library-LZ4-lookup.patch \
           "
-SRC_URI[md5sum] = "b3524c0825c3a1c255496daea38304a0"
-SRC_URI[sha256sum] = "69456ca85bf9d96c6d28b4ade2a9f6787d79a602e27ef941f9ba4e0b55dddedc"
+SRC_URI[md5sum] = "d0de881ab8ead46928cafb7d558535c1"
+SRC_URI[sha256sum] = "4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
new file mode 100644
index 0000000..87c7061
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
@@ -0,0 +1,32 @@
+Subject: [PATCH] Fix build breakage from lock_guard error (#6161)
+
+Summary:
+This change fixes a source issue that caused compile time error which
+breaks build for many fbcode services in that setup. The size() member
+function of channel is a const member, so member variables accessed
+within it are implicitly const as well. This caused error when clang
+fails to resolve to a constructor that takes std::mutex because the
+suitable constructor got rejected due to loss of constness for its
+argument. The fix is to add mutable modifier to the lock_ member of
+channel.
+
+Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161
+
+Differential Revision: D18967685
+
+Pulled By: maysamyabandeh
+
+Upstream-Status: Backport
+
+fbshipit-source-id:698b6a5153c3c92eeacb842c467aa28cc350d432 
+--- a/storage/rocksdb/rocksdb/util/channel.h
++++ b/storage/rocksdb/rocksdb/util/channel.h
+@@ -60,7 +60,7 @@ class channel {
+ 
+  private:
+   std::condition_variable cv_;
+-  std::mutex lock_;
++  mutable std::mutex lock_;
+   std::queue<T> buffer_;
+   bool eof_;
+ };
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
new file mode 100644
index 0000000..574dfd3
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
@@ -0,0 +1,30 @@
+From 1d7612b063eb1fc7bf97bc27b13e1de596748aa1 Mon Sep 17 00:00:00 2001
+From: Sumit Garg <sumit.garg@linaro.org>
+Date: Wed, 8 Jan 2020 04:58:30 +0000
+Subject: [PATCH] Fix library LZ4 lookup.
+
+Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
+---
+ cmake/FindLZ4.cmake | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
+index e97dd63e2b0..2f4694e727c 100644
+--- a/cmake/FindLZ4.cmake
++++ b/cmake/FindLZ4.cmake
+@@ -1,5 +1,10 @@
+-find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
+-find_library(LZ4_LIBRARY NAMES lz4)
++find_path(LZ4_INCLUDE_DIR
++  NAMES	lz4.h
++  NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++
++find_library(LZ4_LIBRARY
++  NAMES lz4
++  NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+-- 
+2.17.1
+
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
index 34d3114..185b7b7 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
+++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
@@ -15,11 +15,9 @@
  storage/rocksdb/build_rocksdb.cmake | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
-index c36c761..2b539ff 100644
 --- a/storage/rocksdb/build_rocksdb.cmake
 +++ b/storage/rocksdb/build_rocksdb.cmake
-@@ -424,6 +424,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINA
  
  ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
  target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
@@ -27,8 +25,5 @@
 +  TARGET_LINK_LIBRARIES(rocksdblib atomic)
 +ENDIF()
  IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -frtti")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp")
  endif()
--- 
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.4.11.bb
similarity index 100%
rename from meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.4.11.bb
diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb
similarity index 63%
rename from meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb
index d5b1ebd..4868519 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb
+++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb
@@ -8,5 +8,5 @@
    file://0001-Improve-reproducibility.patch \
 "
 
-SRC_URI[md5sum] = "87545416ef021eee8621d31a93fcc899"
-SRC_URI[sha256sum] = "cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6"
+SRC_URI[md5sum] = "2ee1bd4ec5f49363a3f456f07e599b41"
+SRC_URI[sha256sum] = "a09bf3abbaf6763980d0f8acbb943b7629a8b20073de18d867aecdb7988483ed"
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-CMake-has-stock-FindZLIB-in-upper-case.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-CMake-has-stock-FindZLIB-in-upper-case.patch
deleted file mode 100644
index 9682f8a..0000000
--- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-CMake-has-stock-FindZLIB-in-upper-case.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 38146a5d803a1fb9b10f011aa857872b6f20cd02 Mon Sep 17 00:00:00 2001
-From: Tongliang Liao <xkszltl@gmail.com>
-Date: Mon, 29 Apr 2019 03:51:51 -0700
-Subject: [PATCH] CMake has stock FindZLIB in upper case. More details in
- https://cmake.org/cmake/help/v3.14/module/FindZLIB.html
-
-
-Upstream-Status: Backport https://github.com/facebook/rocksdb/pull/5261
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 40cdd26bb..355686566 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,7 +92,7 @@ else()
-   endif()
-
-   if(WITH_ZLIB)
--    find_package(zlib REQUIRED)
-+    find_package(ZLIB REQUIRED)
-     add_definitions(-DZLIB)
-     if(ZLIB_INCLUDE_DIRS)
-       # CMake 3
---
-2.11.0
-
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch
deleted file mode 100644
index eccaa3a..0000000
--- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ee728434124b9b7d17abbd060a62aac79a9b79c0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 12 Feb 2019 14:31:24 -0800
-Subject: [PATCH] Disable -Wshadow and do not mark default copy constructors
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt                                     | 2 +-
- utilities/persistent_cache/block_cache_tier.h      | 4 ++--
- utilities/persistent_cache/block_cache_tier_file.h | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 98e2e1973..3a24a075b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -254,7 +254,7 @@ if(FAIL_ON_WARNINGS)
-   if(MSVC)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-   else() # assume GCC
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=shadow")
-   endif()
- endif()
- 
-diff --git a/utilities/persistent_cache/block_cache_tier.h b/utilities/persistent_cache/block_cache_tier.h
-index 2b2c0ef4f..96d0540a4 100644
---- a/utilities/persistent_cache/block_cache_tier.h
-+++ b/utilities/persistent_cache/block_cache_tier.h
-@@ -91,9 +91,9 @@ class BlockCacheTier : public PersistentCacheTier {
-         : key_(std::move(key)), data_(data) {}
-     ~InsertOp() {}
- 
--    InsertOp() = delete;
-+    InsertOp() = default;
-     InsertOp(InsertOp&& /*rhs*/) = default;
--    InsertOp& operator=(InsertOp&& rhs) = default;
-+    InsertOp& operator=(InsertOp&& rhs) = delete;
- 
-     // used for estimating size by bounded queue
-     size_t Size() { return data_.size() + key_.size(); }
-diff --git a/utilities/persistent_cache/block_cache_tier_file.h b/utilities/persistent_cache/block_cache_tier_file.h
-index e38b6c9a1..d9b89a4f7 100644
---- a/utilities/persistent_cache/block_cache_tier_file.h
-+++ b/utilities/persistent_cache/block_cache_tier_file.h
-@@ -262,7 +262,7 @@ class ThreadedWriter : public Writer {
-         : file_(file), buf_(buf), file_off_(file_off), callback_(callback) {}
- 
-     IO(const IO&) = default;
--    IO& operator=(const IO&) = default;
-+    IO& operator=(const IO&) = delete;
-     size_t Size() const { return sizeof(IO); }
- 
-     WritableFile* file_ = nullptr;           // File to write to
--- 
-2.20.1
-
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
new file mode 100644
index 0000000..ac87d0c
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
@@ -0,0 +1,36 @@
+From b626703de7ece507f360507e49d3ecb448b12e07 Mon Sep 17 00:00:00 2001
+From: Maysam Yabandeh <myabandeh@fb.com>
+Date: Thu, 12 Dec 2019 13:48:50 -0800
+Subject: [PATCH] Fix build breakage from lock_guard error (#6161)
+
+Summary:
+This change fixes a source issue that caused compile time error which breaks build for many fbcode services in that setup. The size() member function of channel is a const member, so member variables accessed within it are implicitly const as well. This caused error when clang fails to resolve to a constructor that takes std::mutex because the suitable constructor got rejected due to loss of constness for its argument. The fix is to add mutable modifier to the lock_ member of channel.
+Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161
+
+Differential Revision: D18967685
+
+Pulled By: maysamyabandeh
+
+Upstream-Status: Backport
+
+fbshipit-source-id: 698b6a5153c3c92eeacb842c467aa28cc350d432
+---
+ util/channel.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/channel.h b/util/channel.h
+index 0225482c0..a8a47680a 100644
+--- a/util/channel.h
++++ b/util/channel.h
+@@ -60,7 +60,7 @@ class channel {
+ 
+  private:
+   std::condition_variable cv_;
+-  std::mutex lock_;
++  mutable std::mutex lock_;
+   std::queue<T> buffer_;
+   bool eof_;
+ };
+-- 
+2.24.1
+
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch
new file mode 100644
index 0000000..97ddbce
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch
@@ -0,0 +1,31 @@
+From 49dcd22dcf1aae5995c42eac0fda68516fc1cd43 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Wed, 19 Jun 2019 17:57:24 +0800
+Subject: [PATCH] db/write_thread.cc: Initialize state
+
+Fixed an error when compiled without -O2:
+db/write_thread.cc:183:14: error: 'state' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ db/write_thread.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/db/write_thread.cc b/db/write_thread.cc
+index 835992c..6f99a11 100644
+--- a/db/write_thread.cc
++++ b/db/write_thread.cc
+@@ -59,7 +59,7 @@ uint8_t WriteThread::BlockingAwaitState(Writer* w, uint8_t goal_mask) {
+ 
+ uint8_t WriteThread::AwaitState(Writer* w, uint8_t goal_mask,
+                                 AdaptationContext* ctx) {
+-  uint8_t state;
++  uint8_t state = 0;
+ 
+   // 1. Busy loop using "pause" for 1 micro sec
+   // 2. Else SOMETIMES busy loop using "yield" for 100 micro sec (default)
+-- 
+2.7.4
+
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-fix-Issue-5303.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-fix-Issue-5303.patch
deleted file mode 100644
index ba9834d..0000000
--- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-fix-Issue-5303.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 512aaf3d833973f6146c6f1235b590901876175e Mon Sep 17 00:00:00 2001
-From: biocodz <biocodz@protonmail.com>
-Date: Fri, 7 Jun 2019 09:49:37 -0400
-Subject: [PATCH] fix Issue 5303
-
-Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/5426]
-
----
- db/internal_stats.h                                | 21 +++++++++++++++++++++
- db/version_edit.h                                  |  8 ++++++++
- utilities/persistent_cache/persistent_cache_util.h |  2 +-
- 3 files changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/db/internal_stats.h b/db/internal_stats.h
-index 6fa8727a4..09447644d 100644
---- a/db/internal_stats.h
-+++ b/db/internal_stats.h
-@@ -236,6 +236,27 @@ class InternalStats {
-       }
-     }
-
-+	CompactionStats & operator=(const CompactionStats& c) {
-+	  count = c.count;
-+	  micros = c.micros;
-+	  cpu_micros = c.cpu_micros;
-+	  bytes_read_non_output_levels = c.bytes_read_non_output_levels;
-+	  bytes_read_output_level = c.bytes_read_output_level;
-+	  bytes_written = c.bytes_written;
-+	  bytes_moved = c.bytes_moved;
-+	  num_input_files_in_non_output_levels =
-+	      c.num_input_files_in_non_output_levels;
-+	  num_input_files_in_output_level = c.num_input_files_in_output_level;
-+	  num_output_files = c.num_output_files;
-+	  num_input_records = c.num_input_records;
-+	  num_dropped_records = c.num_dropped_records;
-+	  int num_of_reasons = static_cast<int>(CompactionReason::kNumOfReasons);
-+	  for (int i = 0; i < num_of_reasons; i++) {
-+	  	counts[i] = c.counts[i];
-+	  }
-+	  return *this;
-+	}
-+
-     void Clear() {
-       this->micros = 0;
-       this->cpu_micros = 0;
-diff --git a/db/version_edit.h b/db/version_edit.h
-index 229531792..5c50ef552 100644
---- a/db/version_edit.h
-+++ b/db/version_edit.h
-@@ -52,6 +52,14 @@ struct FileDescriptor {
-         smallest_seqno(_smallest_seqno),
-         largest_seqno(_largest_seqno) {}
-
-+  FileDescriptor(const FileDescriptor& fd) {
-+    table_reader = fd.table_reader;
-+    packed_number_and_path_id = fd.packed_number_and_path_id;
-+    file_size = fd.file_size;
-+    smallest_seqno = fd.smallest_seqno;
-+    largest_seqno = fd.largest_seqno;
-+  }
-+
-   FileDescriptor& operator=(const FileDescriptor& fd) {
-     table_reader = fd.table_reader;
-     packed_number_and_path_id = fd.packed_number_and_path_id;
-diff --git a/utilities/persistent_cache/persistent_cache_util.h b/utilities/persistent_cache/persistent_cache_util.h
-index 214bb5875..254c038f9 100644
---- a/utilities/persistent_cache/persistent_cache_util.h
-+++ b/utilities/persistent_cache/persistent_cache_util.h
-@@ -48,7 +48,7 @@ class BoundedQueue {
-     T t = std::move(q_.front());
-     size_ -= t.Size();
-     q_.pop_front();
--    return std::move(t);
-+    return t;
-   }
-
-   size_t Size() const {
---
-2.11.0
-
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch
deleted file mode 100644
index ef0429a..0000000
--- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8996f075e64da0e6ffeda57632ef31f8710defcc Mon Sep 17 00:00:00 2001
-From: He Zhe <zhe.he@windriver.com>
-Date: Fri, 15 Mar 2019 16:47:03 +0800
-Subject: [PATCH] utilities: Fix build failure with -Werror=maybe-uninitialized
-
-Summary:
-Initialize magic_number to zero to avoid such failure.
-utilities/blob_db/blob_log_format.cc:91:3: error: 'magic_number' may be used
-uninitialized in this function [-Werror=maybe-uninitialized]
-   if (magic_number != kMagicNumber) {
-   ^~
-
-Upstream-Status: Accepted [expected version 5.19]
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- utilities/blob_db/blob_log_format.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utilities/blob_db/blob_log_format.cc b/utilities/blob_db/blob_log_format.cc
-index 2bf7028..8726cb8 100644
---- a/utilities/blob_db/blob_log_format.cc
-+++ b/utilities/blob_db/blob_log_format.cc
-@@ -82,7 +82,7 @@ Status BlobLogFooter::DecodeFrom(Slice src) {
-   uint32_t src_crc = 0;
-   src_crc = crc32c::Value(src.data(), BlobLogFooter::kSize - sizeof(uint32_t));
-   src_crc = crc32c::Mask(src_crc);
--  uint32_t magic_number;
-+  uint32_t magic_number = 0;
-   if (!GetFixed32(&src, &magic_number) || !GetFixed64(&src, &blob_count) ||
-       !GetFixed64(&src, &expiration_range.first) ||
-       !GetFixed64(&src, &expiration_range.second) || !GetFixed32(&src, &crc)) {
--- 
-2.7.4
-
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
index 9fd5ee1..713d5bb 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
+++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
@@ -6,15 +6,13 @@
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
 
-SRCREV = "628a7fd74b5611657106c57f724f1682b114684c"
-SRCBRANCH = "6.0.fb"
-PV = "6.0.2"
+SRCREV = "4cfbd87afd08a16df28436fb990ef6b154ee6114"
+SRCBRANCH = "6.5.fb"
+PV = "6.5.2"
 
 SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \
-           file://0001-CMake-has-stock-FindZLIB-in-upper-case.patch \
-           file://0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch \
-           file://0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch \
-           file://0001-fix-Issue-5303.patch \
+           file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \
+           file://0001-db-write_thread.cc-Initialize-state.patch \
           "
 
 S = "${WORKDIR}/git"
@@ -22,9 +20,9 @@
 inherit cmake
 
 PACKAGECONFIG ??= "bzip2 zlib lz4 gflags"
-PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON -DBZIP2_LIBRARIES:STRING=bz2,-DWITH_BZ2=OFF,bzip2"
-PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON -DLZ4_LIBRARIES:STRING=lz4,-DWITH_LZ4=OFF,lz4"
-PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON -DZLIB_LIBRARY:STRING=z,-DWITH_ZLIB=OFF,zlib"
+PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2"
+PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON,-DWITH_LZ4=OFF,lz4"
+PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib"
 PACKAGECONFIG[zstd] = "-DWITH_ZSTD=ON,-DWITH_ZSTD=OFF,zstd"
 PACKAGECONFIG[lite] = "-DROCKSDB_LITE=ON,-DROCKSDB_LITE=OFF"
 PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags"
@@ -34,6 +32,7 @@
     -DPORTABLE=ON \
     -DWITH_TESTS=OFF \
     -DWITH_TOOLS=OFF \
+    -DFAIL_ON_WARNINGS=OFF \
 "
 
 do_install_append() {