Accepting request 992178 from home:fcrozat:branches:GNOME:Factory

- Allow to build without vala support.
- Refresh harden_accounts-daemon.service.patch to not duplicate
  existing entries.

OBS-URL: https://build.opensuse.org/request/show/992178
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=156

accountsservice.changes

@@ -1,9 +1,9 @@
 -------------------------------------------------------------------
-Mon Aug  1 12:01:59 UTC 2022 - Matthias Gerstner <matthias.gerstner@suse.com>
+Fri Jul 29 13:11:50 UTC 2022 - Frederic Crozat <fcrozat@suse.com>
 
-- remove BuildIgnore for rpmlint-mini. This is a violation of the security
+- Allow to build without vala support.
-  policies applying to SUSE products as it circumvents the SUSE security team's
+- Refresh harden_accounts-daemon.service.patch to not duplicate
-  control over what enters Factory and what not.
+  existing entries.
 
 -------------------------------------------------------------------
 Sat Apr 30 20:16:58 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>

accountsservice.spec

@@ -16,6 +16,10 @@
 #
 
 
+# allow to not build vala binding
+%bcond_without vala
+
+#!BuildIgnore:  rpmlint-mini
 Name:           accountsservice
 Version:        22.08.8
 Release:        0
@@ -40,7 +44,6 @@ Patch1000:      as-fate318433-prevent-same-account-multi-logins.patch
 BuildRequires:  gtk-doc
 BuildRequires:  meson
 BuildRequires:  pkgconfig
-BuildRequires:  vala
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.63.5
 BuildRequires:  pkgconfig(gio-unix-2.0)
@@ -91,17 +94,20 @@ Requires:       typelib-1_0-AccountsService-1_0 = %{version}
 The accountsservice server provides a set of D-Bus interfaces for
 querying and manipulating user account information.
 
+%if %{with vala}
 %package vala
 Summary:        Vala bindings for accountsservice
 Group:          Development/Libraries/C and C++
 Requires:       libaccountsservice0 = %{version}
 Requires:       typelib-1_0-AccountsService-1_0 = %{version}
+BuildRequires:  vala
 
 %description vala
 The accountsservice server provides a set of D-Bus interfaces for
 querying and manipulating user account information.
 
 This package contains the Vala bindings for accountservice.
+%endif
 
 %lang_package
 
@@ -120,6 +126,11 @@ This package contains the Vala bindings for accountservice.
 %meson \
 	-Dintrospection=true \
 	-Dgtk_doc=true \
+%if %{with vala}
+	-Dvapi=true \
+%else
+	-Dvapi=false \
+%endif
 	%{nil}
 %meson_build
 
@@ -174,10 +185,12 @@ This package contains the Vala bindings for accountservice.
 %{_includedir}/accountsservice-1.0/
 %{_datadir}/gir-1.0/AccountsService-1.0.gir
 
+%if %{with vala}
 %files vala
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/accountsservice.deps
 %{_datadir}/vala/vapi/accountsservice.vapi
+%endif
 
 %files lang -f accounts-service.lang
 

harden_accounts-daemon.service.patch

@@ -1,20 +1,16 @@
-Index: accountsservice-0.6.55/data/accounts-daemon.service.in
+Index: accountsservice-22.08.8/data/accounts-daemon.service.in
 ===================================================================
---- accountsservice-0.6.55.orig/data/accounts-daemon.service.in
+--- accountsservice-22.08.8.orig/data/accounts-daemon.service.in	2022-02-23 16:27:48.000000000 +0100
-+++ accountsservice-0.6.55/data/accounts-daemon.service.in
++++ accountsservice-22.08.8/data/accounts-daemon.service.in	2022-08-02 09:17:14.424438207 +0200
-@@ -8,6 +8,15 @@ After=nss-user-lookup.target
+@@ -8,6 +8,11 @@
  Wants=nss-user-lookup.target
  
  [Service]
 +# added automatically, for details please see
 +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
-+PrivateDevices=true
 +ProtectHostname=true
 +ProtectClock=true
-+ProtectKernelTunables=true
-+ProtectKernelModules=true
 +ProtectKernelLogs=true
-+ProtectControlGroups=true
  Type=dbus
  BusName=org.freedesktop.Accounts
  ExecStart=@libexecdir@/accounts-daemon