From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- sys-apps/fwupd/Manifest | 3 + .../fwupd/files/fwupd-1.3.8-report_uploading.patch | 34 +++++ sys-apps/fwupd/fwupd-1.3.8.ebuild | 168 +++++++++++++++++++++ 3 files changed, 205 insertions(+) create mode 100644 sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch create mode 100644 sys-apps/fwupd/fwupd-1.3.8.ebuild (limited to 'sys-apps/fwupd') diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 952591d495a8..deea970a727a 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,8 +1,11 @@ +AUX fwupd-1.3.8-report_uploading.patch 875 BLAKE2B 460db033bdb0ea865402ce938b586221c3543e9b4e0dc4e09504f1364a4cfff81e59cf38eb9732b89075eec8000f9afdb3ccf26002f829a4ae4ecf21ce92a723 SHA512 f89718b2aa695b44a2f382e6c5f5e0114f4086710d112d33c764f8450d8c2cfc4d3b14ee87c9f76c9c155d8fd2f70c5701a267487476bae190825978080a0879 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb 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 EBUILD fwupd-1.2.11.ebuild 3841 BLAKE2B e4e3bc8c24019820ab5e2ac4afc84385fd97743b6c7f13564947010504a2ab548a9e593e922c3e7a98d2a86c90e05f4c46c70508903280e5937dd025a6441c19 SHA512 36921af2092640f1da1eaf0bf5fd52d5116f33e9218eb0355767a5b2590620942a74ee8d28c0351015d25e725c106783b10904f66aec84579f69a3ec2b1867a5 EBUILD fwupd-1.3.6.ebuild 4074 BLAKE2B e0a15aca14f956e4f07c008114d3ea26437bc5a2e2220fe4e6296f596306cc4b43bbf6107f26c9e4ddd980b31b2806fb2b74fa98223aae00349da4b68aa54c0f SHA512 d118e5801846d35da86aa1c0b47f1bc217665e4c7356210587c9ed217416fe9c530e4df1f8942f8356b342ad288524acf8a84a1110fec35acba30a584dfcb343 EBUILD fwupd-1.3.7.ebuild 4107 BLAKE2B e4dbfb28be95ac707c8fbd29fa5336415f4864dac394b75e5458489444c8fb66bceea72ca074825729d716e6625608f5a898053ac23d425c5e5e0bf9def958a2 SHA512 10bebe2bb2d346fcb10f140d8483fd649b184f5ecbd467b279e708db3de7395f847d2b8fc3babad9294d63c6233a40ce3fe8c477d44af0c72b51bee22549915f +EBUILD fwupd-1.3.8.ebuild 4209 BLAKE2B de17002a4e62e9ebabb9e96a7e119be7ec2415f9fdf22a1e3396b9f8af2b63fe47047d6cf071e1a8011434b9183f6ef0718f4a2add45f85349da4389367e7791 SHA512 8d1c1a2c84ac2c6ae675e81b87bf9270cb8c583735f42fba57518d402171666e8b0ee676bc6bdedc67bd5a2b11115e867f3b5cf2f838186c35d52cc625a00fe9 MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d 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 000000000000..c0e006a7536d --- /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 000000000000..ca087051eeb6 --- /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