meta-openembedded: subtree update:5caca0f7bd..fe77eaab8f

Adam Miartus (3):
      meta-oe toybox-inittab: toybox inittab implementation
      meta-oe toybox-inittab: allow getty as a packageconfig feature
      meta-oe toybox: enable toybox init when selected as init manager

Alex Kiernan (1):
      libgusb: Upgrade 0.3.0+ -> 0.3.4

Andreas Müller (48):
      gfbgraph: initial add 0.2.4
      libgdata: Change PACKAGECONFIG defaults
      gnome-photos: initial add 3.34.2
      dconf: upgrade 0.34.0 -> 0.36.0
      dconf-editor: upgrade 3.34.2 -> 3.36.2
      nautilus: upgrade 3.34.3 -> 3.36.3
      evince: upgrade 3.34.2 -> 3.36.3
      evolution-data-server: upgrade 3.34.4 -> 3.36.3
      file-roller: upgrade 3.32.5 -> 3.36.2
      amtk: initial add 5.1.1
      uchardet: initial add 0.0.7
      tepl: initial add 4.4.0
      gedit: upgradde 3.34.1 -> 3.36.2
      gdm: upgrade 3.34.1 -> 3.36.2
      gnome-backgrounds: upgrade 3.34.0 -> 3.36.0
      gnome-calculator: upgrade 3.34.1 -> 3.36.0
      gnome-system-monitor: upgrade 3.32.1 -> 3.36.1
      gvfs: upgrade 1.42.2 -> 1.44.1
      gtksourceview4: upgrade 4.4.0 -> 4.6.0
      gnome-desktop3; upgrade 3.34.5 -> 3.36.2
      gnome-panel: upgrade 3.34.1 -> 3.36.1
      gnome-flashback: upgrade 3.34.2 -> 3.36.3
      gnome-keyring: upgrade 3.34.0 -> 3.36.0
      gnome-menus3: upgrade 3.32.0 -> 3.36.0
      gnome-online-accounts: upgrade 3.34.1 -> 3.36.0
      gnome-session: upgrade 3.34.2 -> 3.36.0
      gnome-settings-daemon: upgrade 3.34.2 -> 3.36.1
      gnome-terminal: upgrade 3.34.2 -> 3.36.2
      grilo: upgrade 0.3.10 -> 0.3.12
      libgnomekbd: remove
      libgweather: upgrade 3.34.0 -> 3.36.0
      libwnck3: upgrade 3.32.0 -> 3.36.0
      metacity: upgrade 3.34.1 -> 3.36.1
      graphene: initial add 1.10.0
      yelp-xsl: upgrade 3.34.2 -> 3.36.0
      yelp: upgrade 3.34.0 -> 3.36.0
      sysprof: upgrade 3.34.1 -> 3.36.0
      gnome-control-center: upgrade 3.34.5 -> 3.36.2
      libblockdev: upgrade 2.23 -> 2.24
      poppler: upgrade 0.88.0 -> 0.89.0
      gtksourceview: remove forgotten files
      vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches
      vlc: upgrade 3.0.9.2 -> 3.0.10
      babl: upgrade 0.1.74 -> 0.1.78
      gegl: upgrade 0.4.22 -> 0.4.24
      libmypaint: upgrade 1.4.0 -> 1.6.1
      mypaint-brushes-1.0: upgrade 1.3.0 -> 1.3.1
      gimp: upgrade 2.10.18 -> 2.10.20

Andrej Valek (1):
      thrift: drop unsupported features

Bog999 (1):
      python3: Add python3-cryptography to RDEPENDS for python3-redis

Changqing Li (3):
      packagegroup-xfce-base: add RDEPEND packagegroup-core-x11
      python-django: add RDEPENDS
      python-m2crypto: Add RDEPENDS

Chenxi Mao (1):
      geoclue: select avahi-daemon if nmea enabled

Christian Eggers (4):
      graphviz: Extend for nativesdk
      ttf-dejavu: Extend for native and nativesdk
      gd: Extend for native and nativesdk
      mscgen: Extend for native and nativesdk

Denys Dmytriyenko (1):
      serialcheck: switch to a fork and update to the latest

Jacob Kroon (1):
      meta-oe: Don't inherit 'features_check' in recipes that don't utilize it

Joris Offouga (1):
      c-periphery: add recipe

Kai Kang (1):
      lvm2: remove service template from SYSTEMD_SERVICE

Khem Raj (5):
      python3-zopeinterface: Upgrade to 5.1.0
      multipath-tools: Fix build with json-c 0.14 and newer
      toybox-inittab: Get rid of bashism
      mpv: Drop unused features_check inherit
      evince: Drop unused features_check inherit

Konrad Weihmann (3):
      mpd: fix PACKAGECONFIG assignment
      netkit-rsh: properly append PACKAGECONFIG
      zile: properly append PACKAGECONFIG

Lei YU (1):
      httpfs2: mount a http url as a file based on FUSE

Leon Anavi (57):
      python3-unidiff: Upgrade 0.5.5 -> 0.6.0
      python3-tzlocal: Upgrade 2.0.0 -> 2.1
      python3-serpent: Upgrade 1.28 -> 1.30.2
      python3-python-vlc: Upgrade 3.0.7110 -> 3.0.9113
      python3-gast: Upgrade 0.2.2 -> 0.3.3
      python3-langtable: Upgrade 0.0.38 -> 0.0.51
      python3-automat: Upgrade 0.8.0 -> 20.2.0
      python3-humanize: Upgrade 0.5.1 -> 2.4.0
      python-pyaudio: Consolidate in a single file
      python3-isort: Consolidate in a single file
      python3-editor: Consolidate in a single file
      python3-engineio: Upgrade 3.12.1 -> 3.13.0
      python3-feedformatter: Consolidate in a single file
      python3-decorator: Consolidate in a single file
      python3-dateutil: Consolidate in a single file
      python3-dnspython: Consolidate in a single file
      python3-future: Consolidate in a single file
      python3-requests-futures: Upgrade 0.9.5 -> 1.0.0
      python3-greenlet: Consolidate in a single file
      python3-html2text: Upgrade 2019.8.11 -> 2020.1.16
      python3-jsonpatch: Consolidate in a single file
      python3-jsonschema: Consolidate in a single file
      python3-evdev: Consolidate in a single file
      python3-oauthlib: Consolidate in a single file
      python3-oauthlib: Upgrade 2.0.6 -> 3.1.0
      python3-tornado: Consolidate in a single file
      python3-tornado: Upgrade 6.0.3 -> 6.0.4
      python3-waitress: Upgrade 1.4.3 -> 1.4.4
      python3-urllib3: Upgrade 1.25.7 -> 1.25.9
      python3-ujson: Upgrade 2.0.3 -> 3.0.0
      python3-wheel: Upgrade 0.33.6 -> 0.34.2
      python3-wcwidth: Upgrade 0.1.8 -> 0.2.4
      python3-twine: Upgrade 1.13.0 -> 3.1.1
      python3-beautifulsoup4: Upgrade 4.8.2 -> 4.9.1
      python3-bitarray: Upgrade 1.2.1 -> 1.2.2
      python3-soupsieve: Upgrade 1.9.4 -> 2.0.1
      python3-meld3: Consolidate in a single file
      python3-meld3: Upgrade 1.0.2 -> 2.0.1
      python3-markupsafe: Consolidate in a single file
      python3-more-itertools: Consolidate in a single file
      python3-more-itertools: Upgrade 8.2.0 -> 8.3.0
      python3-nmap: Upgrade 1.4.1 -> 1.4.7
      python3-multidict: Upgrade 4.7.5 -> 4.7.6
      python3-lxml: Consolidate in a single file
      python3-hyperlink: Consolidate in a single file
      python3-humanfriendly: Upgrade 4.18 -> 8.2
      python3-html5lib: Consolidate in a single file
      python3-progress: Consolidate in a single file
      python3-prettytable: Consolidate in a single file
      python3-lxml: Upgrade 4.5.0 -> 4.5.1
      python3-pika: Consolidate in a single file
      python3-pluggy: Consolidate in a single file
      python3-ply: Consolidate in a single file
      python3-pocketsphinx: Consolidate in a single file
      python3-pocketsphinx: 0.1.0 -> 0.1.15
      python3-pint: Consolidate in a single file
      python3-pint: Upgrade 0.11 -> 0.12

Martin Jansa (1):
      meta-python: depend on core version 12 or higher

Martin Kelly (4):
      mosquitto: add native, nativesdk support
      msgpack-c: add native, nativesdk support
      mosquitto: typo fix
      python3-paho-mqtt: add native,nativesdk support

Mingli Yu (2):
      python3-webcolors: add the missing rdepends
      python3-m2crypto: add the missing rdepends

Naveen Saini (2):
      ace: add new recipe
      ocl-icd_git.bb: Add recipe for OpenCL ICD loaders

Peace Lee (1):
      guider: Upgrade to 3.9.7

Pierre-Jean Texier (14):
      zchunk: upgrade 1.1.5 -> 1.1.6
      uriparser: upgrade 0.9.3 -> 0.9.4
      dbus-brocker: upgrade 22 -> 23
      jsoncpp: upgrade 1.9.2 -> 1.9.3
      hwdata: upgrade 0.333 -> 0.336
      libiio: upgrade 0.19 -> 0.20
      libnfc: upgrade 1.7.1 -> 1.8.0
      tcpreplay: fix upstream check URL
      tinyproxy: fix upstream check URL
      jpnevulator: upgrade 2.3.4 -> 2.3.5
      libnftnl: upgrade 1.1.6 -> 1.1.7
      nftables: upgrade 0.9.4 -> 0.9.5
      libzip: upgrade 1.6.1 -> 1.7.0
      haveged: upgrade 1.9.8 -> 1.9.9

Qi.Chen@windriver.com (1):
      python-django: set CVE_PRODUCT to be django

Wang Mingyu (5):
      opensaf: upgrade 5.19.10 -> 5.20.05
      dash: upgrade 0.5.10.2 -> 0.5.11
      postgresql: 12.2 -> 12.3
      python3-pycodestyle: upgrade 2.5.0 -> 2.6.0
      python3-scapy: upgrade 0.25 -> 0.26

Yi Zhao (1):
      gpsd: add new init script

Yongxin Liu (1):
      intel-speed-select: Add new recipe for the tool to validate Intel SST

Zang Ruochen (7):
      proj: upgrade 7.0.0 -> 7.0.1
      mksh: upgrade 58 -> 59
      libvpx: upgrade 1.8.1 -> 1.8.2
      mercurial: upgrade 5.2 -> 5.4
      libcgi-perl: upgrade 4.47 -> 4.48
      mm-common: upgrade 1.0..0 -> 1.0.1
      cryptsetup: upgrade 2.3.2 -> 2.3.3

Zheng Ruoqin (2):
      nghttp2: upgrade 1.40.0 -> 1.41.0
      python3-inflection: upgrade 0.3.1 -> 0.5.0

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I15cb7860a288b903ef186f1979ee028e6f54ea50
diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.3.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.3.bb
new file mode 100644
index 0000000..93eba93
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.3.bb
@@ -0,0 +1,92 @@
+SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes"
+DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \
+device-mapper mappings. These include plain dm-crypt volumes and \
+LUKS volumes. The difference is that LUKS uses a metadata header \
+and can hence offer more features than plain dm-crypt. On the other \
+hand, the header is visible and vulnerable to damage."
+HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup"
+SECTION = "console"
+LICENSE = "GPL-2.0-with-OpenSSL-exception"
+LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
+
+DEPENDS = " \
+    json-c \
+    libdevmapper \
+    popt \
+    util-linux \
+"
+
+RDEPENDS_${PN} = " \
+    libdevmapper \
+"
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
+SRC_URI[md5sum] = "6c0ce8be21a7687b89354c77757d0c5b"
+SRC_URI[sha256sum] = "3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df"
+
+inherit autotools gettext pkgconfig
+
+# Use openssl because libgcrypt drops root privileges
+# if libgcrypt is linked with libcap support
+PACKAGECONFIG ??= " \
+    keyring \
+    cryptsetup \
+    veritysetup \
+    cryptsetup-reencrypt \
+    integritysetup \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
+    kernel_crypto \
+    internal-argon2 \
+    blkid \
+    luks-adjust-xts-keysize \
+    openssl \
+"
+PACKAGECONFIG_append_class-target = " \
+    udev \
+"
+
+PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring"
+PACKAGECONFIG[fips] = "--enable-fips,--disable-fips"
+PACKAGECONFIG[pwquality] = "--enable-pwquality,--disable-pwquality,libpwquality"
+PACKAGECONFIG[passwdqc] = "--enable-passwdqc,--disable-passwdqc,passwdqc"
+PACKAGECONFIG[cryptsetup] = "--enable-cryptsetup,--disable-cryptsetup"
+PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup"
+PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt"
+PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
+PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev"
+PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto"
+# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't
+# recognized.
+PACKAGECONFIG[gcrypt-pbkdf2] = "--enable-gcrypt-pbkdf2"
+PACKAGECONFIG[internal-argon2] = "--enable-internal-argon2,--disable-internal-argon2"
+PACKAGECONFIG[internal-sse-argon2] = "--enable-internal-sse-argon2,--disable-internal-sse-argon2"
+PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux"
+PACKAGECONFIG[dev-random] = "--enable-dev-random,--disable-dev-random"
+PACKAGECONFIG[luks-adjust-xts-keysize] = "--enable-luks-adjust-xts-keysize,--disable-luks-adjust-xts-keysize"
+PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl"
+PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt"
+PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss"
+PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel"
+PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle"
+PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1"
+
+RRECOMMENDS_${PN} = "kernel-module-aes-generic \
+                     kernel-module-dm-crypt \
+                     kernel-module-md5 \
+                     kernel-module-cbc \
+                     kernel-module-sha256-generic \
+                     kernel-module-xts \
+"
+
+EXTRA_OECONF = "--enable-static"
+# Building without largefile is not supported by upstream
+EXTRA_OECONF += "--enable-largefile"
+# Requires a static popt library
+EXTRA_OECONF += "--disable-static-cryptsetup"
+# There's no recipe for libargon2 yet
+EXTRA_OECONF += "--disable-libargon2"
+
+FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}"
+
+BBCLASSEXTEND = "native nativesdk"