diff --git a/.files b/.files index 63aa54b..29c2f9d 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 8269c11..98003fc 100644 --- a/.rev +++ b/.rev @@ -1084,4 +1084,12 @@ By now, it's required for sle-15, so synchronized the updated specfile and chang 964524 + + ac6108c69c920edd492f2a6fa93f4b79 + 22.04.62 + + dimstar_suse + - Drop harden_accounts-daemon.service.patch: Seems to conflict with + SELinux since version 22.04.62. + diff --git a/.servicemark b/.servicemark new file mode 100644 index 0000000..5ab3b0f --- /dev/null +++ b/.servicemark @@ -0,0 +1 @@ +652f0579944f098ac2f2e8f4832d356e diff --git a/accountsservice.changes b/accountsservice.changes index 6c09e4c..2a1d687 100644 --- a/accountsservice.changes +++ b/accountsservice.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 28 07:32:37 UTC 2022 - Dominique Leuenberger + +- Drop harden_accounts-daemon.service.patch: Seems to conflict with + SELinux since version 22.04.62. + +------------------------------------------------------------------- Fri Feb 11 23:35:22 UTC 2022 - Bjørn Lie - Update to version 22.04.62: diff --git a/accountsservice.spec b/accountsservice.spec index 1eb400b..397523f 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -28,8 +28,6 @@ Source0: https://www.freedesktop.org/software/accountsservice/%{name}-%{v # WARNING: do not remove/significantly change patch0 without updating the relevant patch in gdm too # PATCH-FIX-OPENSUSE accountsservice-sysconfig.patch bnc#688071 vuntz@opensuse.org -- Read/write autologin configuration from sysconfig, like gdm (see gdm-sysconfig-settings.patch) Patch1: accountsservice-sysconfig.patch -# PATCH-FIX-OPENSUSE harden_accounts-daemon.service.patch jsegitz@suse.com -- For details please see https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort -Patch2: harden_accounts-daemon.service.patch ## SLE and Leap only patches start at 1000 # PATCH-FEATURE-SLE as-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login. @@ -97,7 +95,6 @@ querying and manipulating user account information. %prep %setup -q %patch1 -p1 -%patch2 -p1 # SLE and Leap patches start at 1000 %if 0%{?sle_version} diff --git a/harden_accounts-daemon.service.patch b/harden_accounts-daemon.service.patch deleted file mode 100644 index ce95962..0000000 --- a/harden_accounts-daemon.service.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: accountsservice-22.04.62/data/accounts-daemon.service.in -=================================================================== ---- accountsservice-22.04.62.orig/data/accounts-daemon.service.in -+++ accountsservice-22.04.62/data/accounts-daemon.service.in -@@ -8,6 +8,15 @@ After=nss-user-lookup.target - 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