diff --git a/0003-fix-option-type-for-minimum-uid.patch b/0003-fix-option-type-for-minimum-uid.patch new file mode 100644 index 0000000..27c0073 --- /dev/null +++ b/0003-fix-option-type-for-minimum-uid.patch @@ -0,0 +1,39 @@ +From a8f368c34e826f76d1244fed5095a1615c986b59 Mon Sep 17 00:00:00 2001 +From: Alexey Shabalin +Date: Mon, 1 Oct 2018 18:46:26 +0300 +Subject: [PATCH 2/3] fix option type for minimum uid + +--- + meson.build | 2 +- + meson_options.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 1f75a5b..57f30a5 100644 +--- a/meson.build ++++ b/meson.build +@@ -161,7 +161,7 @@ config_h.set_quoted('ADMIN_GROUP', admin_group) + config_h.set_quoted('EXTRA_ADMIN_GROUPS', extra_admin_groups) + + config_h.set('ENABLE_USER_HEURISTICS', get_option('user_heuristics')) +-config_h.set_quoted('MINIMUM_UID', get_option('minimum_uid')) ++config_h.set('MINIMUM_UID', get_option('minimum_uid')) + + # GDM + gdm_conf_file = get_option('gdmconffile') +diff --git a/meson_options.txt b/meson_options.txt +index 878bdd7..12e2f6b 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -4,7 +4,7 @@ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description + option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts') + option('user_heuristics', type: 'boolean', value: true, description: 'Enable heuristics for guessing system vs. human users in the range 500-minimum-uid') + option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of') +-option('minimum_uid', type: 'string', value: '1000', description: 'Set minimum uid for human users') ++option('minimum_uid', type: 'integer', value: 1000, description: 'Set minimum uid for human users') + + option('systemd', type: 'boolean', value: false, description: 'Use systemd') + option('elogind', type: 'boolean', value: false, description: 'Use elogind') +-- +2.19.1 + diff --git a/accountsservice.spec b/accountsservice.spec index 07bd676..2dcf35e 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -2,7 +2,7 @@ Name: accountsservice Version: 0.6.54 -Release: 3%{?dist} +Release: 4%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information License: GPLv3+ URL: https://www.freedesktop.org/wiki/Software/AccountsService/ @@ -10,6 +10,9 @@ URL: https://www.freedesktop.org/wiki/Software/AccountsService/ #VCS: git:git://git.freedesktop.org/accountsservice Source0: http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz +# https://bugzilla.redhat.com/show_bug.cgi?id=1646418 +Patch1: 0003-fix-option-type-for-minimum-uid.patch + BuildRequires: gettext-devel BuildRequires: pkgconfig(dbus-1) BuildRequires: glib2-devel @@ -98,6 +101,10 @@ files needed to build applications that use accountsservice-libs. %{_datadir}/gtk-doc/html/libaccountsservice/* %changelog +* Mon Jan 21 2019 Alexandru-Sever Horin - 0.6.54-4 +- Add patch from upstream to fix UID detection + Resolves: #1646418 + * Thu Jan 17 2019 Adam Williamson - 0.6.54-3 - Explicitly enable systemd support (#1576903) (Elliott Sales de Andrade)