From ef1e96aadbaaaaf3e330d6b0072084f9b877d06e Mon Sep 17 00:00:00 2001
From: Katerina Koukiou <kkoukiou@redhat.com>
Date: Thu, 15 Dec 2022 15:53:07 +0100
Subject: [PATCH] Update to upstream release 282

Related: rhbz#2139644
---
 .gitignore   |  1 +
 cockpit.spec | 23 +++++++++++++++++++++--
 sources      |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d9f3ccf..2a38404 100644
--- a/.gitignore
+++ b/.gitignore
@@ -248,3 +248,4 @@
 /cockpit-279.tar.xz
 /cockpit-280.tar.xz
 /cockpit-280.1.tar.xz
+/cockpit-282.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index c945c87..337f036 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -49,7 +49,7 @@ Summary:        Web Console for Linux servers
 License:        LGPLv2+
 URL:            https://cockpit-project.org/
 
-Version:        280.1
+Version:        282
 Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 
@@ -74,6 +74,13 @@ Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{v
 %define build_optional 1
 %endif
 
+# Allow root login in Cockpit on RHEL 8 and lower as it also allows password login over SSH.
+%if 0%{?rhel} && 0%{?rhel} <= 8
+%define disallow_root 0
+%else
+%define disallow_root 1
+%endif
+
 # Ship custom SELinux policy (but not for cockpit-appstream)
 %if "%{name}" == "cockpit"
 %define selinuxtype targeted
@@ -481,7 +488,10 @@ if [ "$1" = 1 ]; then
     mkdir -p /etc/motd.d /etc/issue.d
     ln -s ../../run/cockpit/motd /etc/motd.d/cockpit
     ln -s ../../run/cockpit/motd /etc/issue.d/cockpit.issue
-    printf "# List of users which are not allowed to login to Cockpit\nroot\n" > /etc/cockpit/disallowed-users
+    printf "# List of users which are not allowed to login to Cockpit\n" > /etc/cockpit/disallowed-users
+%if 0%{?disallow_root}
+    printf "root\n" >> /etc/cockpit/disallowed-users
+%endif
     chmod 644 /etc/cockpit/disallowed-users
 fi
 
@@ -662,6 +672,15 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Dec 14 2022 Packit <hello@packit.dev> - 282-1
+- Add right-to-left language support
+- Accounts: Redesign and include groups
+
+
+* Thu Dec 01 2022 Packit <hello@packit.dev> - 281-1
+- Dark theme switcher
+
+
 * Thu Nov 24 2022 Packit <hello@packit.dev> - 280.1-1
 - Exclude kpatch test on RHEL gating
 
diff --git a/sources b/sources
index 63b2063..0240f25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-280.1.tar.xz) = cbfaeb35ef49e390e21c95e743c4f24e8715a6f55fe294e2325bf5768fa371370f250916a21f33e90221ae5fde725ad5f5d6bfac766c2e2a80c57c79e363f421
+SHA512 (cockpit-282.tar.xz) = a8cc07f42424dfb7663e383dba0d99bf86a28cb79e356b8e79b863f73f2e84908537233cdadfc2f0d18dd21d110c1a4d35f0b8c10d5a9d1436d6c5241074106e