From 18ecba6c281165f450a1ed9eb304a5326149139f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 10 Sep 2018 19:10:00 -0300 Subject: [PATCH] fwupd: update to 1.1.2. --- .../fwupd/patches/fix-systemd-breakage.patch | 68 ++++++------------- srcpkgs/fwupd/template | 4 +- 2 files changed, 23 insertions(+), 49 deletions(-) diff --git a/srcpkgs/fwupd/patches/fix-systemd-breakage.patch b/srcpkgs/fwupd/patches/fix-systemd-breakage.patch index b6eb4756698..59af1857cee 100644 --- a/srcpkgs/fwupd/patches/fix-systemd-breakage.patch +++ b/srcpkgs/fwupd/patches/fix-systemd-breakage.patch @@ -1,6 +1,6 @@ --- data/meson.build +++ data/meson.build -@@ -30,59 +30,18 @@ if get_option('daemon') +@@ -30,12 +30,12 @@ if get_option('daemon') ) endif @@ -9,28 +9,19 @@ - con2.set('libexecdir', libexecdir) - con2.set('bindir', bindir) - con2.set('datadir', datadir) -- -- rw_directories = [] -- rw_directories += join_paths (localstatedir, 'lib', 'fwupd') -- rw_directories += join_paths (default_sysconfdir, 'fwupd', 'remotes.d') -- if get_option('plugin_uefi') -- rw_directories += ['-/boot/efi', '-/efi', '-/boot/EFI'] -- endif -- -- dynamic_options = [] -- if systemd.version().version_compare('>= 232') -- dynamic_options += 'ProtectControlGroups=yes' -- dynamic_options += 'ProtectKernelModules=yes' -- endif -- if systemd.version().version_compare('>= 231') -- dynamic_options += 'RestrictRealtime=yes' -- dynamic_options += 'MemoryDenyWriteExecute=yes' -- dynamic_options += ['ReadWritePaths=' + ' '.join(rw_directories)] -- else -- dynamic_options += ['ReadWriteDirectories=' + ' '.join(rw_directories)] -- endif -- con2.set('dynamic_options', '\n'.join(dynamic_options)) -- ++con2 = configuration_data() ++con2.set('libexecdir', libexecdir) ++con2.set('bindir', bindir) ++con2.set('datadir', datadir) + ++if get_option('systemd') + rw_directories = [] + rw_directories += join_paths (localstatedir, 'lib', 'fwupd') + rw_directories += join_paths (default_sysconfdir, 'fwupd', 'remotes.d') +@@ -57,17 +57,20 @@ if get_option('systemd') + endif + con2.set('dynamic_options', '\n'.join(dynamic_options)) + - # replace @libexecdir@ - configure_file( - input : 'org.freedesktop.fwupd.service.in', @@ -41,30 +32,8 @@ - 'dbus-1', - 'system-services'), - ) -- -- # replace @bindir@ -- configure_file( -- input : 'fwupd-offline-update.service.in', -- output : 'fwupd-offline-update.service', -- configuration : con2, -- install: true, -- install_dir: systemdunitdir, -- ) -- -- # replace @dynamic_options@ -- configure_file( -- input : 'fwupd.service.in', -- output : 'fwupd.service', -- configuration : con2, -- install: true, -- install_dir: systemdunitdir, -- ) --endif -+con2 = configuration_data() -+con2.set('libexecdir', libexecdir) -+con2.set('bindir', bindir) -+con2.set('datadir', datadir) -+ ++endif + +# replace @libexecdir@ +configure_file( + input : 'org.freedesktop.fwupd.service.in', @@ -75,3 +44,8 @@ + 'dbus-1', + 'system-services'), +) ++ ++if get_option('systemd') + # replace @bindir@ + configure_file( + input : 'fwupd-offline-update.service.in', diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index 9fd5a4f3f7d..c81e83fd7a8 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,6 +1,6 @@ # Template file for 'fwupd' pkgname=fwupd -version=1.1.1 +version=1.1.2 revision=1 build_style=meson # manpages fail to build @@ -18,7 +18,7 @@ maintainer="maxice8 " license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/fwupd" distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz" -checksum=6959299eebf1e0fc747174b34e12159e6da42c92d556f1485d3e70aa391c1eba +checksum=90e152e1fac6be10985588e21f2e7cdd47fe843afbf5f2252022f681f1f7f96b nocross="depends on python3-gobject whether or not introspection is enabled" conf_files="/etc/dbus-1/system.d/org.freedesktop.fwupd.conf /etc/fwupd/daemon.conf /etc/fwupd/remotes.d/*.conf"