diff options
| -rw-r--r-- | community/fwupd/APKBUILD | 10 | ||||
| -rw-r--r-- | community/fwupd/fix-lib64-bubblewrap-bind.patch | 12 | ||||
| -rw-r--r-- | community/fwupd/fix-no-systemd.patch | 49 | ||||
| -rw-r--r-- | community/fwupd/fixes.patch | 18 |
4 files changed, 17 insertions, 72 deletions
diff --git a/community/fwupd/APKBUILD b/community/fwupd/APKBUILD index 64cb3b2500..43a33391ba 100644 --- a/community/fwupd/APKBUILD +++ b/community/fwupd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=fwupd -pkgver=1.3.4 +pkgver=1.3.5 pkgrel=0 pkgdesc="Firmware update daemon" url="https://fwupd.org/" @@ -19,8 +19,8 @@ checkdepends="bubblewrap" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc" source="fwupd-$pkgver.tar.gz::https://github.com/hughsie/fwupd/archive/$pkgver.tar.gz $pkgname.initd - fixes.patch fix-version.patch + fix-lib64-bubblewrap-bind.patch " build() { @@ -70,7 +70,7 @@ package() { install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -sha512sums="00b6ba394c74252c1c7eba5e5e1fd92f234fb6db6de8bca69fbc578bf3b12790867b6adaef6c422c801d28990d390bbe8af67ab0f5bd3a744adbeb053708a254 fwupd-1.3.4.tar.gz +sha512sums="b1944b06bed9cb10ec90219235b168a76fcf6ff7b8938dfba36259f07efed71a755d7b91fcbe8f6fda00ac971bd5d4734a49e045005e2e1c32b49fc5b86c48dd fwupd-1.3.5.tar.gz ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766 fwupd.initd -0298319cb5249326ef2576612165a1c4775128fcbd58a19367385816873b56d59cfdcc2d0ef8c95e92fc7a454974aede361de43f132c024272cb5fce7b6dbbcb fixes.patch -fcd75b9f367d970c2d08e53fbd6a98f553726dbcae2b2e92ab15ad564cdd9f0ea29574f4ad06e98923deab78ab2c1220cf5aceab839b6f2c7de3652b5551227b fix-version.patch" +fcd75b9f367d970c2d08e53fbd6a98f553726dbcae2b2e92ab15ad564cdd9f0ea29574f4ad06e98923deab78ab2c1220cf5aceab839b6f2c7de3652b5551227b fix-version.patch +4a5cc7cb87b91345ad98e11ebbc67e0e8c1b124e7e01376f58886a0858cc68ef96f8edc46a41793f407821d2d5c9e91f7a962d4149732e803f6dde579a8c1b3b fix-lib64-bubblewrap-bind.patch" diff --git a/community/fwupd/fix-lib64-bubblewrap-bind.patch b/community/fwupd/fix-lib64-bubblewrap-bind.patch new file mode 100644 index 0000000000..5993811c17 --- /dev/null +++ b/community/fwupd/fix-lib64-bubblewrap-bind.patch @@ -0,0 +1,12 @@ +diff --git a/libfwupdplugin/fu-common.c b/libfwupdplugin/fu-common.c +index 7ad33f8..f3423a7 100644 +--- a/libfwupdplugin/fu-common.c ++++ b/libfwupdplugin/fu-common.c +@@ -501,7 +501,6 @@ fu_common_firmware_builder (GBytes *bytes, + fu_common_add_argv (argv, "--die-with-parent"); + fu_common_add_argv (argv, "--ro-bind /usr /usr"); + fu_common_add_argv (argv, "--ro-bind /lib /lib"); +- fu_common_add_argv (argv, "--ro-bind /lib64 /lib64"); + fu_common_add_argv (argv, "--ro-bind /bin /bin"); + fu_common_add_argv (argv, "--ro-bind /sbin /sbin"); + fu_common_add_argv (argv, "--dir /tmp"); diff --git a/community/fwupd/fix-no-systemd.patch b/community/fwupd/fix-no-systemd.patch deleted file mode 100644 index 1c5466b05a..0000000000 --- a/community/fwupd/fix-no-systemd.patch +++ /dev/null @@ -1,49 +0,0 @@ -Only in fwupd-1.2.9.new: output -diff -ru fwupd-1.2.9/src/fu-tool.c fwupd-1.2.9.new/src/fu-tool.c ---- fwupd-1.2.9/src/fu-tool.c 2019-05-20 13:17:42.000000000 +0300 -+++ fwupd-1.2.9.new/src/fu-tool.c 2019-06-07 14:50:24.112996194 +0300 -@@ -113,8 +113,10 @@ - { - g_autoptr(GError) error_local = NULL; - -+#ifdef HAVE_SYSTEMD - if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), &error_local)) - g_debug ("Failed top stop daemon: %s", error_local->message); -+#endif - if (!fu_engine_load (priv->engine, flags, error)) - return FALSE; - if (fu_engine_get_tainted (priv->engine)) { -diff -ru fwupd-1.2.9/src/fu-util-common.c fwupd-1.2.9.new/src/fu-util-common.c ---- fwupd-1.2.9/src/fu-util-common.c 2019-05-20 13:17:42.000000000 +0300 -+++ fwupd-1.2.9.new/src/fu-util-common.c 2019-06-07 14:52:03.371845913 +0300 -@@ -15,7 +15,6 @@ - - #ifdef HAVE_SYSTEMD - #include "fu-systemd.h" --#endif - - #define SYSTEMD_FWUPD_UNIT "fwupd.service" - #define SYSTEMD_SNAP_FWUPD_UNIT "snap.fwupd.fwupd.service" -@@ -61,6 +60,7 @@ - - return TRUE; - } -+#endif - - void - fu_util_print_data (const gchar *title, const gchar *msg) -diff -ru fwupd-1.2.9/src/fu-util.c fwupd-1.2.9.new/src/fu-util.c ---- fwupd-1.2.9/src/fu-util.c 2019-05-20 13:17:42.000000000 +0300 -+++ fwupd-1.2.9.new/src/fu-util.c 2019-06-07 14:53:13.841029263 +0300 -@@ -2122,7 +2122,11 @@ - if (!fu_util_prompt_for_boolean (FALSE)) - return TRUE; - } -+#ifdef HAVE_SYSTEMD - return fu_systemd_unit_stop (fu_util_get_systemd_unit (), error); -+#else -+ return TRUE; -+#endif - } - - static void diff --git a/community/fwupd/fixes.patch b/community/fwupd/fixes.patch deleted file mode 100644 index 896c3d138b..0000000000 --- a/community/fwupd/fixes.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ru fwupd-1.2.9.orig/src/fu-common.c fwupd-1.2.9/src/fu-common.c ---- fwupd-1.2.9.orig/src/fu-common.c 2019-05-20 13:17:42.000000000 +0300 -+++ fwupd-1.2.9/src/fu-common.c 2019-06-09 13:48:00.861388043 +0300 -@@ -460,7 +460,6 @@ - fu_common_add_argv (argv, "--die-with-parent"); - fu_common_add_argv (argv, "--ro-bind /usr /usr"); - fu_common_add_argv (argv, "--ro-bind /lib /lib"); -- fu_common_add_argv (argv, "--ro-bind /lib64 /lib64"); - fu_common_add_argv (argv, "--ro-bind /bin /bin"); - fu_common_add_argv (argv, "--ro-bind /sbin /sbin"); - fu_common_add_argv (argv, "--dir /tmp"); -diff -ru fwupd-1.2.9.orig/data/tests/builder/startup.sh fwupd-1.2.9/data/tests/builder/startup.sh ---- fwupd-1.2.9.orig/data/tests/builder/startup.sh 2019-05-20 13:17:42.000000000 +0300 -+++ fwupd-1.2.9/data/tests/builder/startup.sh 2019-06-07 21:43:43.543150907 +0300 -@@ -1,2 +1,2 @@ --#/bin/sh -+#!/bin/sh - cat source.bin | rev > firmware.bin |