1 |
commit: 8c596c03338428080fb50327379d6819cc77fe62 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 29 14:48:25 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 29 14:48:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c596c03 |
7 |
|
8 |
Revert "sys-apps/fwupd: Security cleanup" |
9 |
|
10 |
This reverts commit 1ce9ba4c9e139be0110a6801d941bd9ea5344ef2 |
11 |
which breaks revdeps on arm |
12 |
|
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
sys-apps/fwupd/Manifest | 1 + |
16 |
sys-apps/fwupd/fwupd-1.2.11.ebuild | 144 +++++++++++++++++++++++++++++++++++++ |
17 |
sys-apps/fwupd/metadata.xml | 1 + |
18 |
3 files changed, 146 insertions(+) |
19 |
|
20 |
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest |
21 |
index 109db0674b8..79f3f3a7349 100644 |
22 |
--- a/sys-apps/fwupd/Manifest |
23 |
+++ b/sys-apps/fwupd/Manifest |
24 |
@@ -1,3 +1,4 @@ |
25 |
+DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de |
26 |
DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2 |
27 |
DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd |
28 |
DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e |
29 |
|
30 |
diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..7239b28afea |
33 |
--- /dev/null |
34 |
+++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild |
35 |
@@ -0,0 +1,144 @@ |
36 |
+# Copyright 1999-2020 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
40 |
+ |
41 |
+PYTHON_COMPAT=( python3_{6,7} ) |
42 |
+ |
43 |
+inherit meson python-single-r1 vala xdg-utils |
44 |
+ |
45 |
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" |
46 |
+HOMEPAGE="https://fwupd.org" |
47 |
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
48 |
+ |
49 |
+LICENSE="LGPL-2.1+" |
50 |
+SLOT="0" |
51 |
+KEYWORDS="amd64 ~arm x86" |
52 |
+IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi" |
53 |
+RESTRICT="!test? ( test )" |
54 |
+ |
55 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
56 |
+ ^^ ( consolekit elogind systemd ) |
57 |
+ dell? ( uefi ) |
58 |
+" |
59 |
+ |
60 |
+RDEPEND="${PYTHON_DEPS} |
61 |
+ app-arch/gcab |
62 |
+ app-arch/libarchive:= |
63 |
+ dev-db/sqlite |
64 |
+ >=dev-libs/glib-2.45.8:2 |
65 |
+ dev-libs/json-glib |
66 |
+ dev-libs/libgpg-error |
67 |
+ dev-libs/libgudev:= |
68 |
+ >=dev-libs/libgusb-0.2.9[introspection] |
69 |
+ >=dev-libs/libxmlb-0.1.7 |
70 |
+ $(python_gen_cond_dep ' |
71 |
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}] |
72 |
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}] |
73 |
+ dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] |
74 |
+ ') |
75 |
+ >=net-libs/libsoup-2.51.92:2.4[introspection] |
76 |
+ >=sys-auth/polkit-0.103 |
77 |
+ virtual/libelf:0= |
78 |
+ colorhug? ( >=x11-misc/colord-1.2.12:0= ) |
79 |
+ consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
80 |
+ dell? ( |
81 |
+ sys-libs/efivar |
82 |
+ >=sys-libs/libsmbios-2.4.0 |
83 |
+ ) |
84 |
+ elogind? ( sys-auth/elogind ) |
85 |
+ gpg? ( |
86 |
+ app-crypt/gpgme |
87 |
+ dev-libs/libgpg-error |
88 |
+ ) |
89 |
+ nvme? ( sys-libs/efivar ) |
90 |
+ pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) |
91 |
+ redfish? ( sys-libs/efivar ) |
92 |
+ systemd? ( >=sys-apps/systemd-211 ) |
93 |
+ uefi? ( |
94 |
+ media-libs/fontconfig |
95 |
+ media-libs/freetype |
96 |
+ sys-boot/gnu-efi |
97 |
+ >=sys-libs/efivar-33 |
98 |
+ x11-libs/cairo |
99 |
+ ) |
100 |
+" |
101 |
+DEPEND="${RDEPEND} |
102 |
+ $(vala_depend) |
103 |
+ x11-libs/pango[introspection] |
104 |
+ nvme? ( >=sys-kernel/linux-headers-4.4 ) |
105 |
+ test? ( net-libs/gnutls[tools] ) |
106 |
+" |
107 |
+BDEPEND=" |
108 |
+ >=dev-util/meson-0.47.0 |
109 |
+ virtual/pkgconfig |
110 |
+ doc? ( dev-util/gtk-doc ) |
111 |
+ man? ( |
112 |
+ app-text/docbook-sgml-utils |
113 |
+ sys-apps/help2man |
114 |
+ ) |
115 |
+" |
116 |
+ |
117 |
+# required for fwupd daemon to run. |
118 |
+# NOT a build time dependency. The build system does not check for dbus. |
119 |
+PDEPEND="sys-apps/dbus" |
120 |
+ |
121 |
+src_prepare() { |
122 |
+ default |
123 |
+ sed -e "s/'--create'/'--absolute-name', '--create'/" \ |
124 |
+ -i data/tests/builder/meson.build || die |
125 |
+ sed -e "/'-Werror',/d" \ |
126 |
+ -i plugins/uefi/efi/meson.build || die |
127 |
+ vala_src_prepare |
128 |
+} |
129 |
+ |
130 |
+src_configure() { |
131 |
+ xdg_environment_reset |
132 |
+ local emesonargs=( |
133 |
+ --localstatedir "${EPREFIX}"/var |
134 |
+ -Dagent="$(usex agent true false)" |
135 |
+ -Dconsolekit="$(usex consolekit true false)" |
136 |
+ -Dgtkdoc="$(usex doc true false)" |
137 |
+ -Delogind="$(usex elogind true false)" |
138 |
+ -Dgpg="$(usex gpg true false)" |
139 |
+ -Dman="$(usex man true false)" |
140 |
+ -Dpkcs7="$(usex pkcs7 true false)" |
141 |
+ -Dplugin_dell="$(usex dell true false)" |
142 |
+ # Requires libflashrom which our sys-apps/flashrom |
143 |
+ # package does not provide |
144 |
+ -Dplugin_flashrom="false" |
145 |
+ # Dependencies are not available (yet?) |
146 |
+ -Dplugin_modem_manager="false" |
147 |
+ -Dplugin_nvme="$(usex nvme true false)" |
148 |
+ -Dplugin_redfish="$(usex redfish true false)" |
149 |
+ -Dplugin_synaptics="$(usex dell true false)" |
150 |
+ -Dplugin_thunderbolt="$(usex thunderbolt true false)" |
151 |
+ -Dplugin_uefi="$(usex uefi true false)" |
152 |
+ -Dsystemd="$(usex systemd true false)" |
153 |
+ -Dtests="$(usex test true false)" |
154 |
+ ) |
155 |
+ |
156 |
+ meson_src_configure |
157 |
+} |
158 |
+ |
159 |
+src_install() { |
160 |
+ meson_src_install |
161 |
+ |
162 |
+ sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ |
163 |
+ "${FILESDIR}"/${PN}-r1 \ |
164 |
+ > "${T}"/${PN} || die |
165 |
+ doinitd "${T}"/${PN} |
166 |
+ |
167 |
+ if ! use systemd ; then |
168 |
+ # Don't timeout when fwupd is running (#673140) |
169 |
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ |
170 |
+ -i "${ED}"/etc/${PN}/daemon.conf || die |
171 |
+ fi |
172 |
+} |
173 |
+ |
174 |
+pkg_postinst() { |
175 |
+ elog "In case you are using openrc as init system" |
176 |
+ elog "and you're upgrading from <fwupd-1.1.0, you" |
177 |
+ elog "need to start the fwupd daemon via the openrc" |
178 |
+ elog "init script that comes with this package." |
179 |
+} |
180 |
|
181 |
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml |
182 |
index 9ff465d6aed..5543dd01883 100644 |
183 |
--- a/sys-apps/fwupd/metadata.xml |
184 |
+++ b/sys-apps/fwupd/metadata.xml |
185 |
@@ -8,6 +8,7 @@ |
186 |
<use> |
187 |
<flag name="agent">Enable update notification agent</flag> |
188 |
<flag name="amt">Build and install Intel AMT plugin</flag> |
189 |
+ <flag name="colorhug">Enable ColorHug support through<pkg>x11-misc/colord</pkg> package</flag> |
190 |
<flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag> |
191 |
<flag name="dell">Enable Dell-specific support.</flag> |
192 |
<flag name="gpg">Enable GPG support.</flag> |