Index: sysutils/fwupd/Makefile =================================================================== --- sysutils/fwupd/Makefile +++ sysutils/fwupd/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= fwupd -DISTVERSION= 1.5.7 +DISTVERSION= 1.5.9 +GH_TAGNAME= 58fbbc2 CATEGORIES= sysutils MAINTAINER= norbert.kaminski@3mdeb.com Index: sysutils/fwupd/distinfo =================================================================== --- sysutils/fwupd/distinfo +++ sysutils/fwupd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615551252 -SHA256 (fwupd-fwupd-1.5.7_GH0.tar.gz) = 2e5990ee5e308a369469bc602f7be7d9810ff24bffa885835268275630ecf78b -SIZE (fwupd-fwupd-1.5.7_GH0.tar.gz) = 2498618 +TIMESTAMP = 1618840241 +SHA256 (fwupd-fwupd-1.5.9-58fbbc2_GH0.tar.gz) = 0731f5e8f38d728ad5b40e9a7abe6bb349ce81c9553f7171a1f29f90b4e2254d +SIZE (fwupd-fwupd-1.5.9-58fbbc2_GH0.tar.gz) = 3758499 Index: sysutils/fwupd/files/patch-libfwupd_meson.build =================================================================== --- sysutils/fwupd/files/patch-libfwupd_meson.build +++ /dev/null @@ -1,10 +0,0 @@ ---- libfwupd/meson.build.orig 2021-02-23 14:54:50 UTC -+++ libfwupd/meson.build -@@ -154,6 +154,7 @@ if get_option('introspection') - input: fwupd_gir[0], - output: 'fwupd.map', - command: [ -+ python3, - join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), - 'LIBFWUPD', - '@INPUT@', Index: sysutils/fwupd/files/patch-libfwupdplugin_fu-common.c =================================================================== --- sysutils/fwupd/files/patch-libfwupdplugin_fu-common.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libfwupdplugin/fu-common.c.orig 2021-02-23 14:54:50 UTC -+++ libfwupdplugin/fu-common.c -@@ -2257,7 +2257,7 @@ fu_byte_array_set_size (GByteArray *array, guint lengt - gboolean - fu_common_kernel_locked_down (void) - { --#ifndef _WIN32 -+#ifdef __linux__ - gsize len = 0; - g_autofree gchar *dir = fu_common_get_path (FU_PATH_KIND_SYSFSDIR_SECURITY); - g_autofree gchar *fname = g_build_filename (dir, "lockdown", NULL); Index: sysutils/fwupd/files/patch-libfwupdplugin_fu-efivar.c =================================================================== --- sysutils/fwupd/files/patch-libfwupdplugin_fu-efivar.c +++ /dev/null @@ -1,56 +0,0 @@ ---- libfwupdplugin/fu-efivar.c.orig 2021-02-23 14:54:50 UTC -+++ libfwupdplugin/fu-efivar.c -@@ -10,7 +10,7 @@ - #include - #include - #include --#ifndef _WIN32 -+#ifdef __linux__ - #include - #include - #include -@@ -49,7 +49,7 @@ fu_efivar_get_filename (const gchar *guid, const gchar - gboolean - fu_efivar_supported (GError **error) - { --#ifndef _WIN32 -+#ifdef __linux__ - g_autofree gchar *efivardir = fu_efivar_get_path (); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - if (!g_file_test (efivardir, G_FILE_TEST_IS_DIR)) { -@@ -71,7 +71,7 @@ fu_efivar_supported (GError **error) - #endif - } - --#ifndef _WIN32 -+#ifdef __linux__ - static gboolean - fu_efivar_set_immutable_fd (int fd, - gboolean value, -@@ -135,7 +135,7 @@ fu_efivar_set_immutable (const gchar *fn, - gboolean *value_old, - GError **error) - { --#ifndef _WIN32 -+#ifdef __linux__ - gint fd; - g_autoptr(GInputStream) istr = NULL; - -@@ -298,7 +298,7 @@ gboolean - fu_efivar_get_data (const gchar *guid, const gchar *name, guint8 **data, - gsize *data_sz, guint32 *attr, GError **error) - { --#ifndef _WIN32 -+#ifdef __linux__ - gssize attr_sz; - gssize data_sz_tmp; - guint32 attr_tmp; -@@ -546,7 +546,7 @@ gboolean - fu_efivar_set_data (const gchar *guid, const gchar *name, const guint8 *data, - gsize sz, guint32 attr, GError **error) - { --#ifndef _WIN32 -+#ifdef __linux__ - int fd; - int open_wflags; - gboolean was_immutable; Index: sysutils/fwupd/files/patch-libfwupdplugin_fu-udev-device.c =================================================================== --- sysutils/fwupd/files/patch-libfwupdplugin_fu-udev-device.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libfwupdplugin/fu-udev-device.c.orig 2021-02-23 14:54:50 UTC -+++ libfwupdplugin/fu-udev-device.c -@@ -1588,7 +1588,7 @@ gboolean - fu_udev_device_write_sysfs (FuUdevDevice *self, const gchar *attribute, - const gchar *val, GError **error) - { --#ifndef _WIN32 -+#ifdef __linux__ - ssize_t n; - int r; - int fd; Index: sysutils/fwupd/files/patch-libfwupdplugin_meson.build =================================================================== --- sysutils/fwupd/files/patch-libfwupdplugin_meson.build +++ /dev/null @@ -1,10 +0,0 @@ ---- libfwupdplugin/meson.build.orig 2021-02-23 14:54:50 UTC -+++ libfwupdplugin/meson.build -@@ -222,6 +222,7 @@ if get_option('introspection') and get_option('gusb') - input: fwupdplugin_gir[0], - output: 'fwupdplugin.map', - command: [ -+ python3, - join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), - 'LIBFWUPDPLUGIN', - '@INPUT@', Index: sysutils/fwupd/files/patch-meson.build =================================================================== --- sysutils/fwupd/files/patch-meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build.orig 2021-02-23 14:54:50 UTC -+++ meson.build -@@ -242,7 +242,7 @@ if build_daemon - warning('Polkit is disabled, the daemon will allow ALL client actions') - endif - udevdir = get_option('udevdir') -- if udevdir == '' -+ if udevdir == '' and host_machine.system() == 'linux' - udev = dependency('udev') - udevdir = udev.get_pkgconfig_variable('udevdir') - endif Index: sysutils/fwupd/files/patch-plugins_dfu-csr_meson.build =================================================================== --- sysutils/fwupd/files/patch-plugins_dfu-csr_meson.build +++ /dev/null @@ -1,8 +0,0 @@ ---- plugins/dfu-csr/meson.build.orig 2021-02-23 14:54:50 UTC -+++ plugins/dfu-csr/meson.build -@@ -1,4 +1,4 @@ --if get_option('gusb') -+if get_option('gusb') and host_machine.system() == 'linux' - cargs = ['-DG_LOG_DOMAIN="FuPluginDfuCsr"'] - - install_data(['dfu-csr.quirk'], Index: sysutils/fwupd/files/patch-plugins_dfu_meson.build =================================================================== --- sysutils/fwupd/files/patch-plugins_dfu_meson.build +++ /dev/null @@ -1,8 +0,0 @@ ---- plugins/dfu/meson.build.orig 2021-02-23 14:54:50 UTC -+++ plugins/dfu/meson.build -@@ -1,4 +1,4 @@ --if get_option('gusb') -+if get_option('gusb') and host_machine.system() == 'linux' - cargs = ['-DG_LOG_DOMAIN="FuPluginDfu"'] - - install_data(['dfu.quirk'], Index: sysutils/fwupd/files/patch-src_fu-engine.c =================================================================== --- sysutils/fwupd/files/patch-src_fu-engine.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/fu-engine.c.orig 2021-02-23 14:54:50 UTC -+++ src/fu-engine.c -@@ -6299,7 +6299,7 @@ fu_engine_load (FuEngine *self, FuEngineLoadFlags flag - guint backend_cnt = 0; - g_autoptr(GPtrArray) checksums_approved = NULL; - g_autoptr(GPtrArray) checksums_blocked = NULL; --#ifndef _WIN32 -+#ifdef __linux__ - g_autoptr(GError) error_local = NULL; - #endif - -@@ -6311,7 +6311,7 @@ fu_engine_load (FuEngine *self, FuEngineLoadFlags flag - return TRUE; - - /* TODO: Read registry key [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Cryptography] "MachineGuid" */ --#ifndef _WIN32 -+#ifdef __linux__ - /* cache machine ID so we can use it from a sandboxed app */ - self->host_machine_id = fwupd_build_machine_id ("fwupd", &error_local); - if (self->host_machine_id == NULL) Index: sysutils/fwupd/files/patch-src_fu-main.c =================================================================== --- sysutils/fwupd/files/patch-src_fu-main.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/fu-main.c.orig 2021-02-23 14:54:50 UTC -+++ src/fu-main.c -@@ -2037,9 +2037,10 @@ main (int argc, char *argv[]) - else if (timed_exit) - g_timeout_add_seconds (5, fu_main_timed_exit_cb, priv->loop); - -+#ifdef __linux__ - /* drop heap except one page */ - malloc_trim (4096); -- -+#endif - /* wait */ - g_message ("Daemon ready for requests (locale %s)", g_getenv ("LANG")); - g_main_loop_run (priv->loop); Index: sysutils/fwupd/files/patch-src_fu-self-test.c =================================================================== --- sysutils/fwupd/files/patch-src_fu-self-test.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/fu-self-test.c.orig 2021-02-23 14:54:50 UTC -+++ src/fu-self-test.c -@@ -583,7 +583,7 @@ fu_engine_requirements_device_func (gconstpointer user - " " - " bootloader" - " vendor-id" --#ifndef _WIN32 -+#ifdef __linux__ - " org.kernel" - #endif - " " Index: sysutils/fwupd/files/patch-subprojects_gusb.wrap =================================================================== --- sysutils/fwupd/files/patch-subprojects_gusb.wrap +++ /dev/null @@ -1,9 +0,0 @@ ---- subprojects/gusb.wrap.orig 2021-02-23 14:54:50 UTC -+++ subprojects/gusb.wrap -@@ -1,4 +1,4 @@ - [wrap-git] - directory = gusb --url = https://github.com/hughsie/libgusb.git --revision = 0.3.5 -+url = https://github.com/3mdeb/libgusb.git -+revision = 36c91ab059c8446902dddd3693070559611c8980 Index: sysutils/fwupd/files/patch-subprojects_libjcat.wrap =================================================================== --- sysutils/fwupd/files/patch-subprojects_libjcat.wrap +++ /dev/null @@ -1,9 +0,0 @@ ---- subprojects/libjcat.wrap.orig 2021-02-23 14:54:50 UTC -+++ subprojects/libjcat.wrap -@@ -1,4 +1,4 @@ - [wrap-git] - directory = libjcat --url = https://github.com/hughsie/libjcat.git -+url = https://github.com/3mdeb/libjcat.git --revision = 0.1.0 -+revision = b5af577e63a009f6423dd5c62cf096ac38386210 Index: sysutils/fwupd/files/patch-subprojects_libxmlb.wrap =================================================================== --- sysutils/fwupd/files/patch-subprojects_libxmlb.wrap +++ /dev/null @@ -1,8 +0,0 @@ ---- subprojects/libxmlb.wrap.orig 2021-02-23 14:54:50 UTC -+++ subprojects/libxmlb.wrap -@@ -1,4 +1,4 @@ - [wrap-git] - directory = libxmlb - url = https://github.com/hughsie/libxmlb.git --revision = 0.1.14 -+revision = 0.2.1 Index: sysutils/fwupd/pkg-plist =================================================================== --- sysutils/fwupd/pkg-plist +++ sysutils/fwupd/pkg-plist @@ -9,7 +9,6 @@ etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service etc/pki/fwupd-metadata/LVFS-CA.pem -etc/pki/fwupd/GPG-KEY-Hughski-Limited etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service etc/pki/fwupd/LVFS-CA.pem @@ -35,6 +34,7 @@ include/fwupd-1/libfwupdplugin/fu-common-guid.h include/fwupd-1/libfwupdplugin/fu-common-version.h include/fwupd-1/libfwupdplugin/fu-common.h +include/fwupd-1/libfwupdplugin/fu-context.h include/fwupd-1/libfwupdplugin/fu-deprecated.h include/fwupd-1/libfwupdplugin/fu-device-locker.h include/fwupd-1/libfwupdplugin/fu-device-metadata.h @@ -45,7 +45,6 @@ include/fwupd-1/libfwupdplugin/fu-efi-signature.h include/fwupd-1/libfwupdplugin/fu-efivar.h include/fwupd-1/libfwupdplugin/fu-firmware-common.h -include/fwupd-1/libfwupdplugin/fu-firmware-image.h include/fwupd-1/libfwupdplugin/fu-firmware.h include/fwupd-1/libfwupdplugin/fu-fmap-firmware.h include/fwupd-1/libfwupdplugin/fu-hid-device.h @@ -92,8 +91,8 @@ lib/libfwupd.so.2 lib/libfwupd.so.2.0.0 lib/libfwupdplugin.so -lib/libfwupdplugin.so.1 -lib/libfwupdplugin.so.1.0.0 +lib/libfwupdplugin.so.2 +lib/libfwupdplugin.so.2.0.0 libdata/pkgconfig/fwupd.pc libdata/pkgconfig/fwupdplugin.pc libexec/fwupd/fwupd @@ -101,12 +100,17 @@ man/man1/fwupdagent.1.gz man/man1/fwupdmgr.1.gz man/man1/fwupdtool.1.gz +share/bash-completion/completions/fwupdagent +share/bash-completion/completions/fwupdmgr +share/bash-completion/completions/fwupdtool share/dbus-1/interfaces/org.freedesktop.fwupd.xml share/dbus-1/system.d/org.freedesktop.fwupd.conf share/fish/vendor_completions.d/fwupdmgr.fish %%DATADIR%%/add_capsule_header.py %%DATADIR%%/firmware_packager.py %%DATADIR%%/install_dell_bios_exe.py +%%DATADIR%%/metainfo/org.freedesktop.fwupd.remotes.lvfs-testing.metainfo.xml +%%DATADIR%%/metainfo/org.freedesktop.fwupd.remotes.lvfs.metainfo.xml %%DATADIR%%/quirks.d/bcm57xx.quirk %%DATADIR%%/quirks.d/ccgx-ids.quirk %%DATADIR%%/quirks.d/ccgx.quirk @@ -131,6 +135,7 @@ %%DATADIR%%/quirks.d/synaptics-prometheus.quirk %%DATADIR%%/quirks.d/system76-launch.quirk %%DATADIR%%/quirks.d/vli-pd.quirk +%%DATADIR%%/quirks.d/vli-usbhub-bizlink.quirk %%DATADIR%%/quirks.d/vli-usbhub-hyper.quirk %%DATADIR%%/quirks.d/vli-usbhub-lenovo.quirk %%DATADIR%%/quirks.d/vli-usbhub.quirk @@ -140,6 +145,41 @@ share/gir-1.0/Fwupd-2.0.gir share/gir-1.0/FwupdPlugin-1.0.gir share/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg +share/locale/af/LC_MESSAGES/fwupd.mo +share/locale/ast/LC_MESSAGES/fwupd.mo +share/locale/ca/LC_MESSAGES/fwupd.mo +share/locale/cs/LC_MESSAGES/fwupd.mo +share/locale/da/LC_MESSAGES/fwupd.mo +share/locale/de/LC_MESSAGES/fwupd.mo +share/locale/en_GB/LC_MESSAGES/fwupd.mo +share/locale/eo/LC_MESSAGES/fwupd.mo +share/locale/eu/LC_MESSAGES/fwupd.mo +share/locale/fi/LC_MESSAGES/fwupd.mo +share/locale/fr/LC_MESSAGES/fwupd.mo +share/locale/fur/LC_MESSAGES/fwupd.mo +share/locale/gl/LC_MESSAGES/fwupd.mo +share/locale/he/LC_MESSAGES/fwupd.mo +share/locale/hi/LC_MESSAGES/fwupd.mo +share/locale/hr/LC_MESSAGES/fwupd.mo +share/locale/hu/LC_MESSAGES/fwupd.mo +share/locale/id/LC_MESSAGES/fwupd.mo +share/locale/it/LC_MESSAGES/fwupd.mo +share/locale/kk/LC_MESSAGES/fwupd.mo +share/locale/ko/LC_MESSAGES/fwupd.mo +share/locale/ky/LC_MESSAGES/fwupd.mo +share/locale/lt/LC_MESSAGES/fwupd.mo +share/locale/nl/LC_MESSAGES/fwupd.mo +share/locale/oc/LC_MESSAGES/fwupd.mo +share/locale/pl/LC_MESSAGES/fwupd.mo +share/locale/pt_BR/LC_MESSAGES/fwupd.mo +share/locale/ru/LC_MESSAGES/fwupd.mo +share/locale/sk/LC_MESSAGES/fwupd.mo +share/locale/sr/LC_MESSAGES/fwupd.mo +share/locale/sv/LC_MESSAGES/fwupd.mo +share/locale/tr/LC_MESSAGES/fwupd.mo +share/locale/uk/LC_MESSAGES/fwupd.mo +share/locale/zh_CN/LC_MESSAGES/fwupd.mo +share/locale/zh_TW/LC_MESSAGES/fwupd.mo share/metainfo/org.freedesktop.fwupd.metainfo.xml share/vala/vapi/fwupd.deps share/vala/vapi/fwupd.vapi