[PATCH 1/4] libjcat: Update to 0.1.9

[PATCH 1/4] libjcat: Update to 0.1.9

[Richard Hughes]

New Features:
 - Set which backends are supported in the pkgconfig file
 - Use -Dcli=false to reduce the install size

Bugfixes:
 - Return an error if we try to self-sign no bytes of data
 - Show a more accurate output when not all engines are enabled

Also, inherit lib_package so the binary isn't installed by default.

Signed-off-by: Richard Hughes <richard@hughsie.com>
---
 .../libjcat/{libjcat_0.1.8.bb => libjcat_0.1.9.bb}          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-gnome/libjcat/{libjcat_0.1.8.bb => libjcat_0.1.9.bb} (80%)

diff --git a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.9.bb
similarity index 80%
rename from meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb
rename to meta-oe/recipes-gnome/libjcat/libjcat_0.1.9.bb
index 87767ac2a..b0871c6a4 100644
--- a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb
+++ b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.9.bb
@@ -8,13 +8,13 @@ DEPENDS = "\
 "
 
 SRC_URI = "\
-    git://github.com/hughsie/libjcat.git;branch=master;protocol=https \
+    git://github.com/hughsie/libjcat.git;branch=main;protocol=https \
     file://run-ptest \
 "
-SRCREV = "356cd2faf2d2197156b0dae7984482cf781d64db"
+SRCREV = "d4833949f8f1997b83f35a03127b9e12c104a7c8"
 S = "${WORKDIR}/git"
 
-inherit gobject-introspection gtk-doc meson ptest-gnome vala
+inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package
 
 PACKAGECONFIG ??= "\
     gpg \
-- 
2.33.1

[PATCH 2/4] libxmlb: Update to 0.3.6

[Richard Hughes]

Bugfixes:
 - Ensure _IS_TOKENIZED is set if tokens are added manually
 - Ensure we never add too many tokens to the silo

Signed-off-by: Richard Hughes <richard@hughsie.com>
---
 .../libxmlb/{libxmlb_0.3.3.bb => libxmlb_0.3.6.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-gnome/libxmlb/{libxmlb_0.3.3.bb => libxmlb_0.3.6.bb} (91%)

diff --git a/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.3.bb b/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.6.bb
similarity index 91%
rename from meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.3.bb
rename to meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.6.bb
index 9b3a343b8..585c49019 100644
--- a/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.3.bb
+++ b/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.6.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742"
 SRC_URI = "git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \
            file://run-ptest \
            "
-SRCREV = "5108556a17bb1c2863c2ca5df088143ea65474a3"
+SRCREV = "89276ffa4407a8d684e95675990fa864793a7586"
 S = "${WORKDIR}/git"
 
 inherit gobject-introspection gtk-doc meson ptest-gnome lib_package
-- 
2.33.1

[PATCH 3/4] libgusb: Update to 0.3.9

[Richard Hughes]

Bugfixes:
 - Fix hotplug after threaded device removal

Also, inherit lib_package so the binary isn't installed by default.

Signed-off-by: Richard Hughes <richard@hughsie.com>
---
 .../libgusb/{libgusb_0.3.8.bb => libgusb_0.3.9.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/libgusb/{libgusb_0.3.8.bb => libgusb_0.3.9.bb} (77%)

diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.8.bb b/meta-oe/recipes-support/libgusb/libgusb_0.3.9.bb
similarity index 77%
rename from meta-oe/recipes-support/libgusb/libgusb_0.3.8.bb
rename to meta-oe/recipes-support/libgusb/libgusb_0.3.9.bb
index 51e734904..dad5b8a23 100644
--- a/meta-oe/recipes-support/libgusb/libgusb_0.3.8.bb
+++ b/meta-oe/recipes-support/libgusb/libgusb_0.3.9.bb
@@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "glib-2.0 libusb"
 
-inherit meson gobject-introspection gtk-doc gettext vala
+inherit meson gobject-introspection gtk-doc gettext vala lib_package
 
 PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}"
 PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false"
 
 SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https"
-SRCREV = "db9edbd8b45662d551194a0985173732f8f557a5"
+SRCREV = "582f33178a986e74543de8ced087865009f8fef0"
 S = "${WORKDIR}/git"
-- 
2.33.1

[PATCH 4/4] fwupd: Update to 1.7.3

[Richard Hughes]

New features:
 - Add a sync-bkc subcommand to ensure a known set of firmware versions
 - Make Upower and powerd support optional

Fixed bugs:
 - Check the value range when parsing the quirk keys
 - Do not wait for a USB runtime if will-disappear is set
 - Enable the MOTD integration when using pam_motd
 - Ignore a USB error for STM32 attach when the device goes away
 - Make the HSI tests optional for embedded targets
 - Make the plugin startup order deterministic
 - Use endian-safe version functions when enumerating Logitech hardware

Adding support for the following hardware:
 - Most Nordic Semiconductor nRF Secure devices

Signed-off-by: Richard Hughes <richard@hughsie.com>
---
 .../fwupd/{fwupd_1.7.2.bb => fwupd_1.7.3.bb}  | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-bsp/fwupd/{fwupd_1.7.2.bb => fwupd_1.7.3.bb} (83%)

diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.7.2.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb
similarity index 83%
rename from meta-oe/recipes-bsp/fwupd/fwupd_1.7.2.bb
rename to meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb
index 939f1c929..b02e8caa2 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd_1.7.2.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
            file://run-ptest"
-SRC_URI[sha256sum] = "8632df69c3bafc59387cdcb517c3ce31a597a09026e44f5907d8384671b9f834"
+SRC_URI[sha256sum] = "109dacc16ed0db71eb08b852e96b070b8c2c53516a3071b9d0683acd8ecd42d9"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 
@@ -24,22 +24,30 @@ PACKAGECONFIG ??= "curl gnutls gudev gusb \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \
                    ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \
                    ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \
+                   hsi \
+                   plugin_acpi_phat \
                    plugin_amt \
+                   plugin_bcm57xx \
                    plugin_emmc \
+                   plugin_ep963x \
                    plugin_fastboot \
                    plugin_flashrom \
                    plugin_intel_spi \
                    plugin_logitech_bulkcontroller \
                    plugin_modem_manager \
                    plugin_msr \
+                   plugin_nitrokey \
                    plugin_nvme \
                    plugin_parade_lspcon \
+                   plugin_pixart_rf \
                    plugin_platform_integrity \
                    plugin_realtek_mst \
                    plugin_redfish \
                    plugin_synaptics_mst \
                    plugin_synaptics_rmi \
-                   plugin_thunderbolt"
+                   plugin_thunderbolt \
+                   plugin_upower \
+                   sqlite"
 
 PACKAGECONFIG[bluetooth] = "-Dbluez=true,-Dbluez=false"
 PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false"
@@ -50,28 +58,38 @@ PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false
 PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
 PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev"
 PACKAGECONFIG[gusb] = "-Dgusb=true,-Dgusb=false,libgusb"
+PACKAGECONFIG[hsi] = "-Dhsi=true,-Dhsi=false"
 PACKAGECONFIG[libarchive] = "-Dlibarchive=true,-Dlibarchive=false,libarchive"
 PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false"
 PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false"
 PACKAGECONFIG[offline] = "-Doffline=true,-Doffline=false"
 PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit"
+PACKAGECONFIG[sqlite] = "-Dsqlite=true,-Dsqlite=false,sqlite3"
 PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native"
 
+
 # TODO plugins-all meta-option that expands to all plugin_*?
+PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false"
 PACKAGECONFIG[plugin_amt] = "-Dplugin_amt=true,-Dplugin_amt=false"
+PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false"
+PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false"
 PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios"
 PACKAGECONFIG[plugin_dummy] = "-Dplugin_dummy=true,-Dplugin_dummy=false"
 PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=true,-Dplugin_emmc=false"
+PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false"
 PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false"
 PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom"
 PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz"
 PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c"
 PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager"
 PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid"
+PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false"
 PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false"
 PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false"
+PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false"
 PACKAGECONFIG[plugin_platform_integrity] = "-Dplugin_platform_integrity=true,-Dplugin_platform_integrity=false"
+PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false"
 PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false"
 PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false"
 PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false"
@@ -81,6 +99,7 @@ PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss"
 # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported
 PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi"
 PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=true,-Dplugin_uefi_pk=false"
+PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false"
 
 # Always disable these plugins on non-x86 platforms as they don't compile or are useless
 DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr plugin_thunderbolt"
-- 
2.33.1