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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83B5E138350 for ; Mon, 17 Feb 2020 09:11:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F236E09CF; Mon, 17 Feb 2020 09:11:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4621FE09CF for ; Mon, 17 Feb 2020 09:11:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78B9134EC26 for ; Mon, 17 Feb 2020 09:11:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA64B129 for ; Mon, 17 Feb 2020 09:11:25 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1581930649.e9383563a1f114c0214768ffc446e0959c5890b8.polynomial-c@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.3.8-report_uploading.patch sys-apps/fwupd/fwupd-1.3.8.ebuild X-VCS-Directories: sys-apps/fwupd/ sys-apps/fwupd/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e9383563a1f114c0214768ffc446e0959c5890b8 X-VCS-Branch: master Date: Mon, 17 Feb 2020 09:11:25 +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: 4c2e8030-edf2-4c9a-bc67-14cd75ea1e06 X-Archives-Hash: 8215c8cd8ff061c6ed20a3fd77fe9f55 commit: e9383563a1f114c0214768ffc446e0959c5890b8 Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 17 09:10:49 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 17 09:10:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9383563 sys-apps/fwupd: Bump to version 1.3.8 Thanks-to: AE gmx.net> Closes: https://bugs.gentoo.org/709496 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> sys-apps/fwupd/Manifest | 1 + .../fwupd/files/fwupd-1.3.8-report_uploading.patch | 34 +++++ sys-apps/fwupd/fwupd-1.3.8.ebuild | 168 +++++++++++++++++++++ 3 files changed, 203 insertions(+) diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index f37c760c4c2..4d30214b4a0 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,3 +1,4 @@ DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78 DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e +DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4 diff --git a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch new file mode 100644 index 00000000000..c0e006a7536 --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch @@ -0,0 +1,34 @@ +From 5c7e17276c8eb0c2a845cecb7d644a4bccf80519 Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Thu, 13 Feb 2020 12:06:41 -0600 +Subject: [PATCH] fu-util: fix a logic error in report uploading introduced in + e076d48afb74d1447936d353f12781755f13b047 + +Fixes: #1770 +--- + src/fu-util.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/fu-util.c b/src/fu-util.c +index 5bcffedeb..e6531c90c 100644 +--- a/src/fu-util.c ++++ b/src/fu-util.c +@@ -286,16 +286,12 @@ fu_util_maybe_enable_automatic (FuUtilPrivate *priv, GPtrArray *remotes, GError + NULL, error)) + return FALSE; + } +- return TRUE; ++ break; + default: + break; + } + +- g_set_error_literal (error, +- FWUPD_ERROR, +- FWUPD_ERROR_NOTHING_TO_DO, +- "invalid option selected"); +- return FALSE; ++ return TRUE; + } + + static gboolean diff --git a/sys-apps/fwupd/fwupd-1.3.8.ebuild b/sys-apps/fwupd/fwupd-1.3.8.ebuild new file mode 100644 index 00000000000..ca087051eeb --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.3.8.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit linux-info meson python-single-r1 vala xdg toolchain-funcs + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( consolekit elogind minimal systemd ) + dell? ( uefi ) + minimal? ( !introspection ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + app-arch/libarchive:= + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libgusb-0.2.9[introspection?] + >=dev-libs/libxmlb-0.1.13 + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + dev-python/pycairo[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + virtual/libelf:0= + virtual/udev + consolekit? ( >=sys-auth/consolekit-1.0.0 ) + dell? ( + sys-libs/efivar + >=sys-libs/libsmbios-2.4.0 + ) + elogind? ( sys-auth/elogind ) + gpg? ( + app-crypt/gpgme + dev-libs/libgpg-error + ) + !minimal? ( + >=sys-auth/polkit-0.103 + ) + nvme? ( sys-libs/efivar ) + pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) + redfish? ( sys-libs/efivar ) + systemd? ( >=sys-apps/systemd-211 ) + thunderbolt? ( + sys-apps/thunderbolt-software-user-space + ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + app-crypt/tpm2-tss + media-libs/fontconfig + media-libs/freetype + sys-boot/gnu-efi + sys-boot/efibootmgr + >=sys-libs/efivar-33 + x11-libs/cairo + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + != 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + vala_src_prepare +} + +src_configure() { + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + $(meson_use agent) + $(meson_use amt plugin_amt) + $(meson_use consolekit) + $(meson_use dell plugin_dell) + $(meson_use elogind) + $(meson_use gpg) + $(meson_use gtk-doc gtkdoc) + $(meson_use man) + $(meson_use nvme plugin_nvme) + $(meson_use pkcs7) + $(meson_use redfish plugin_redfish) + $(meson_use synaptics plugin_synaptics) + $(meson_use systemd) + $(meson_use test tests) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi) + # Requires libflashrom which our sys-apps/flashrom + # package does not provide + -Dplugin_flashrom="false" + # Dependencies are not available (yet?) + -Dplugin_modem_manager="false" + ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ + "${FILESDIR}"/${PN}-r1 \ + > "${T}"/${PN} || die + doinitd "${T}"/${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} + +pkg_postinst() { + xdg_pkg_postinst + elog "In case you are using openrc as init system" + elog "and you're upgrading from