From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F62B15806E for ; Fri, 19 May 2023 08:37:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36F51E087F; Fri, 19 May 2023 08:37:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1178AE087F for ; Fri, 19 May 2023 08:37:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5F1533BE41 for ; Fri, 19 May 2023 08:37:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64E78A74 for ; Fri, 19 May 2023 08:37:51 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1684485458.902d3c43cca21bc6a83905325baa23413b3802d1.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/fwupd/Manifest sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch sys-apps/fwupd/fwupd-1.8.11-r1.ebuild sys-apps/fwupd/fwupd-1.8.15.ebuild X-VCS-Directories: sys-apps/fwupd/files/ sys-apps/fwupd/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 902d3c43cca21bc6a83905325baa23413b3802d1 X-VCS-Branch: master Date: Fri, 19 May 2023 08:37:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bfb16e14-bb98-44c9-92d3-e6a9cf9fa019 X-Archives-Hash: c8bdaf330034760a76fba7c812aa626f commit: 902d3c43cca21bc6a83905325baa23413b3802d1 Author: Marek Szuba gentoo org> AuthorDate: Fri May 19 08:12:04 2023 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri May 19 08:37:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902d3c43 sys-apps/fwupd: add 1.8.15, drop 1.8.11-r1 Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd/Manifest | 2 +- .../files/fwupd-1.8.11-empty_kernel_cmdline.patch | 19 - .../fwupd/files/fwupd-1.8.11-installed_tests.patch | 406 --------------------- ...{fwupd-1.8.11-r1.ebuild => fwupd-1.8.15.ebuild} | 3 +- 4 files changed, 2 insertions(+), 428 deletions(-) diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 2755e0c34e69..4a28e9805f4a 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,3 +1,3 @@ DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97 -DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de DIST fwupd-1.8.14.tar.xz 3733176 BLAKE2B 6d17ee9ce1fb46a9d0a8a97d54f1873888635805af00a05ad365b32d48d6e58b48b52d706400067ca8cf6f6b846f6b8799c44d66ec64ab2fca5812b199ac2ac5 SHA512 80669f1c8ca60ac646f9a7aa4028edd23d1fc6853d999f60d292fabbfc81733f06b1f76a2987f0af62a739aa2cf5cc75fc40c9283fd37f4d8157f1a08df6fcd2 +DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75 diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch b/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch deleted file mode 100644 index 42d5915397b8..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 7e502cf7d3da00a978201455f3a3799ae4aded75 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 6 Mar 2023 16:56:05 +0000 -Subject: [PATCH] Fix a critical warning when parsing an empty kernel cmdline - -Fix the bounds check so we never pass a bufsz of zero to fu_strsplit(). - -Resolves: https://github.com/fwupd/fwupd/issues/5575 ---- a/libfwupdplugin/fu-kernel.c -+++ b/libfwupdplugin/fu-kernel.c -@@ -253,7 +253,7 @@ fu_kernel_get_cmdline(GError **error) - if (!g_file_get_contents("/proc/cmdline", &buf, &bufsz, error)) - return NULL; - hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); -- if (bufsz > 0) { -+ if (bufsz > 1) { - g_auto(GStrv) tokens = fu_strsplit(buf, bufsz - 1, " ", -1); - for (guint i = 0; tokens[i] != NULL; i++) { - g_auto(GStrv) kv = NULL; diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch deleted file mode 100644 index 819b6799ebdf..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch +++ /dev/null @@ -1,406 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -10,20 +10,10 @@ - subdir('fish-completion') - endif - --if get_option('tests') --subdir('device-tests') --endif -- - if build_daemon - subdir('motd') - endif - --if get_option('tests') -- if build_daemon -- subdir('installed-tests') -- endif --endif -- - if build_standalone - install_data(['daemon.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') ---- a/libfwupdplugin/meson.build -+++ b/libfwupdplugin/meson.build -@@ -370,6 +370,7 @@ - ) - test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env) - -+ if false - install_data([ - 'tests/chassis_type', - 'tests/sys_vendor', -@@ -388,6 +389,7 @@ - ], - install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'), - ) -+ endif - endif - - fwupdplugin_incdir = include_directories('.') ---- a/libfwupdplugin/tests/meson.build -+++ b/libfwupdplugin/tests/meson.build -@@ -10,6 +10,5 @@ - command: [ - python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@', - ], -- install: true, - install_dir: installed_test_datadir, - ) ---- a/plugins/acpi-dmar/meson.build -+++ b/plugins/acpi-dmar/meson.build -@@ -28,7 +28,6 @@ - plugin_libs, - plugin_builtin_acpi_dmar, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/acpi-facp/meson.build -+++ b/plugins/acpi-facp/meson.build -@@ -28,7 +28,6 @@ - plugin_libs, - plugin_builtin_acpi_facp, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/acpi-ivrs/meson.build -+++ b/plugins/acpi-ivrs/meson.build -@@ -28,7 +28,6 @@ - plugin_libs, - plugin_builtin_acpi_ivrs, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/acpi-phat/meson.build -+++ b/plugins/acpi-phat/meson.build -@@ -31,7 +31,6 @@ - plugin_libs, - plugin_builtin_acpi_phat, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/ata/meson.build -+++ b/plugins/ata/meson.build -@@ -33,7 +33,6 @@ - plugin_libs, - plugin_builtin_ata, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/bcm57xx/meson.build -+++ b/plugins/bcm57xx/meson.build -@@ -25,8 +25,6 @@ - plugin_builtins += plugin_builtin_bcm57xx - - if get_option('tests') -- install_data(['tests/bcm57xx.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -41,7 +39,6 @@ - plugin_libs, - plugin_builtin_bcm57xx, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/ccgx/meson.build -+++ b/plugins/ccgx/meson.build -@@ -29,8 +29,6 @@ - plugin_builtins += plugin_builtin_ccgx - - if get_option('tests') -- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -45,7 +43,6 @@ - plugin_libs, - plugin_builtin_ccgx, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/dfu/meson.build -+++ b/plugins/dfu/meson.build -@@ -70,7 +70,6 @@ - plugin_libs, - plugin_builtin_dfu, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/elantp/meson.build -+++ b/plugins/elantp/meson.build -@@ -22,8 +22,6 @@ - plugin_builtins += plugin_builtin_elantp - - if get_option('tests') -- install_data(['tests/elantp.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -38,7 +36,6 @@ - plugin_libs, - plugin_builtin_elantp, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/linux-swap/meson.build -+++ b/plugins/linux-swap/meson.build -@@ -28,7 +28,6 @@ - plugin_libs, - plugin_builtin_linux_swap, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/mtd/meson.build -+++ b/plugins/mtd/meson.build -@@ -30,7 +30,6 @@ - plugin_libs, - plugin_builtin_mtd, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/nitrokey/meson.build -+++ b/plugins/nitrokey/meson.build -@@ -33,7 +33,6 @@ - plugin_libs, - plugin_builtin_nitrokey, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/nvme/meson.build -+++ b/plugins/nvme/meson.build -@@ -38,7 +38,6 @@ - plugin_libs, - plugin_builtin_nvme, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/pixart-rf/meson.build -+++ b/plugins/pixart-rf/meson.build -@@ -19,8 +19,6 @@ - plugin_builtins += plugin_builtin_pxi - - if get_option('tests') -- install_data(['tests/pixart.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -35,7 +33,6 @@ - plugin_libs, - plugin_builtin_pxi, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/redfish/meson.build -+++ b/plugins/redfish/meson.build -@@ -40,16 +40,6 @@ - ) - - if get_option('tests') -- install_data(['tests/redfish-smbios.bin'], -- install_dir: join_paths(installed_test_datadir, 'tests')) -- install_data(['tests/redfish.conf'], -- install_dir: join_paths(installed_test_datadir, 'tests'), -- install_mode: 'rw-r-----', -- ) -- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'], -- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars')) -- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'], -- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -70,7 +60,6 @@ - fwupdplugin, - plugin_builtin_redfish, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/synaptics-mst/meson.build -+++ b/plugins/synaptics-mst/meson.build -@@ -22,8 +22,6 @@ - plugin_builtins += plugin_builtin_synaptics_mst - - if get_option('tests') -- install_data(['tests/synaptics-mst.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -47,7 +45,6 @@ - c_args: [ - cargs, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/synaptics-prometheus/meson.build -+++ b/plugins/synaptics-prometheus/meson.build -@@ -18,8 +18,6 @@ - plugin_builtins += plugin_builtin_synaprom - - if get_option('tests') -- install_data(['tests/synaptics-prometheus.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -35,7 +33,6 @@ - plugin_builtin_synaprom, - ], - c_args: cargs, -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/synaptics-rmi/meson.build -+++ b/plugins/synaptics-rmi/meson.build -@@ -25,8 +25,6 @@ - plugin_builtins += plugin_builtin_synaptics_rmi - - if get_option('tests') -- install_data(['tests/synaptics-rmi-0x.builder.xml','tests/synaptics-rmi-10.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -41,7 +39,6 @@ - plugin_libs, - plugin_builtin_synaptics_rmi, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/uefi-capsule/meson.build -+++ b/plugins/uefi-capsule/meson.build -@@ -146,25 +146,6 @@ - c_args: cargs - ) - test('uefi-self-test', e, env: env) -- --# to use these do `sudo systemctl edit fwupd.service` and set --# Environment="FWUPD_SYSFSFWDIR=/usr/share/installed-tests/fwupd" --install_data([ -- 'tests/efi/esrt/entries/entry0/capsule_flags', -- 'tests/efi/esrt/entries/entry0/fw_class', -- 'tests/efi/esrt/entries/entry0/fw_type', -- 'tests/efi/esrt/entries/entry0/fw_version', -- 'tests/efi/esrt/entries/entry0/last_attempt_status', -- 'tests/efi/esrt/entries/entry0/last_attempt_version', -- 'tests/efi/esrt/entries/entry0/lowest_supported_fw_version', -- ], -- install_dir: join_paths(installed_test_datadir, 'efi/esrt/entries/entry0'), --) --install_data([ -- 'tests/efi/efivars/CapsuleMax-39b68c46-f7fb-441b-b6ec-16b0f69821f3', -- ], -- install_dir: join_paths(installed_test_datadir, 'efi/efivars'), --) - endif - - endif ---- a/plugins/uefi-dbx/meson.build -+++ b/plugins/uefi-dbx/meson.build -@@ -32,7 +32,6 @@ - plugin_builtin_uefi_dbx, - ], - c_args: cargs, -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/uf2/meson.build -+++ b/plugins/uf2/meson.build -@@ -18,8 +18,6 @@ - plugin_builtins += plugin_builtin_uf2 - - if get_option('tests') -- install_data(['tests/uf2.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -34,7 +32,6 @@ - plugin_libs, - plugin_builtin_uf2, - ], -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/vli/meson.build -+++ b/plugins/vli/meson.build -@@ -49,7 +49,6 @@ - plugin_builtin_vli, - ], - c_args: cargs, -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/plugins/wacom-usb/meson.build -+++ b/plugins/wacom-usb/meson.build -@@ -23,8 +23,6 @@ - plugin_builtins += plugin_builtin_wac - - if get_option('tests') -- install_data(['tests/wacom-usb.builder.xml'], -- install_dir: join_paths(installed_test_datadir, 'tests')) - env = environment() - env.set('G_TEST_SRCDIR', meson.current_source_dir()) - env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -@@ -40,7 +38,6 @@ - plugin_builtin_wac, - ], - c_args: cargs, -- install: true, - install_rpath: libdir_pkg, - install_dir: installed_test_bindir, - ) ---- a/src/tests/host-emulate/meson.build -+++ b/src/tests/host-emulate/meson.build -@@ -8,7 +8,6 @@ - output: '@0@.gz'.format(input_file), - capture: true, - command: [gzip, '-k', '--stdout', '@INPUT@'], -- install: true, - install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'), - ) - endforeach diff --git a/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.15.ebuild similarity index 97% rename from sys-apps/fwupd/fwupd-1.8.11-r1.ebuild rename to sys-apps/fwupd/fwupd-1.8.15.ebuild index fa2a0075952f..0689a45a9731 100644 --- a/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild +++ b/sys-apps/fwupd/fwupd-1.8.15.ebuild @@ -92,8 +92,7 @@ DEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.8.11-installed_tests.patch - "${FILESDIR}"/${PN}-1.8.11-empty_kernel_cmdline.patch + "${FILESDIR}"/${PN}-1.8.13-installed_tests.patch ) src_prepare() {