Accepting request 911219 from systemsmanagement:cockpit

OBS-URL: https://build.opensuse.org/request/show/911219
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=15

0001-selinux-allow-login-to-read-motd-file.patch

@@ -0,0 +1,28 @@
+From 7884908e248a5954380cdfdb97f168e9f988fa54 Mon Sep 17 00:00:00 2001
+From: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Fri, 6 Aug 2021 15:11:23 +0200
+Subject: [PATCH] selinux: allow login to read motd file
+
+---
+ selinux/cockpit.te | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/selinux/cockpit.te b/selinux/cockpit.te
+index b9910165c..52fc5fe63 100644
+--- a/selinux/cockpit.te
++++ b/selinux/cockpit.te
+@@ -180,3 +180,11 @@ optional_policy(`
+ optional_policy(`
+ 	unconfined_domtrans(cockpit_session_t)
+ ')
++
++# login may read motd file through pam
++optional_policy(`
++    gen_require(`
++        type local_login_t;
++    ')
++    cockpit_read_pid_files(local_login_t)
++')
+-- 
+2.26.2
+

_service

@@ -3,7 +3,8 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="url">http://github.com/cockpit-project/cockpit.git</param>
     <param name="scm">git</param>
-    <param name="revision">245</param>
+    <param name="revision">250</param>
+    <param name="submodules">disable</param>
   </service>
   <service name="node_modules" mode="manual">
     <param name="cpio">node_modules.obscpio</param>

cockpit-redhatfont.diff

@@ -1,6 +1,6 @@
-From a911add6a66d376e0b9cef306f88a1c8289b4eb6 Mon Sep 17 00:00:00 2001
+From 37ca23741f6f0a2a05b31f75014076cbf64174ee Mon Sep 17 00:00:00 2001
 From: Ludwig Nussel <ludwig.nussel@suse.de>
-Date: Fri, 30 Apr 2021 15:10:59 +0200
+Date: Wed, 4 Aug 2021 09:50:25 +0200
 Subject: [PATCH] Need local reference for redhat font
 
 ---
@@ -8,13 +8,13 @@ Subject: [PATCH] Need local reference for redhat font
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/package.json b/package.json
-index 92c13f112..3f65d2087 100644
+index ed3eb085e..f68f93d2e 100644
 --- a/package.json
 +++ b/package.json
 @@ -7,7 +7,7 @@
-     "@patternfly/react-core": "4.106.2",
-     "@patternfly/react-styles": "4.9.4",
-     "@patternfly/react-table": "4.24.1",
+     "@patternfly/react-core": "4.144.0",
+     "@patternfly/react-styles": "4.11.7",
+     "@patternfly/react-table": "4.29.33",
 -    "@redhat/redhat-font": "git+https://github.com/RedHatOfficial/RedHatFont.git#2.2.0",
 +    "@redhat/redhat-font": "2.2.0",
      "bootstrap": "3.4.1",

cockpit.changes

@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Tue Aug  3 14:46:16 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
+
+- new version 250
+  https://cockpit-project.org/blog/cockpit-250.html
+- fix pam_motd selinux denial (0001-selinux-allow-login-to-read-motd-file.patch)
+
 -------------------------------------------------------------------
 Thu May 27 11:01:03 UTC 2021 - Adam Majer <adam.majer@suse.de>
 
-- new version 255
+- new version 245
   https://cockpit-project.org/blog/cockpit-245.html
 
 -------------------------------------------------------------------

cockpit.obsinfo

@@ -1,5 +1,5 @@
 name: cockpit
-version: 245
-mtime: 1622038378
-commit: c7909bce3ef754fffe080beb399da97b91ffd268
+version: 250
+mtime: 1628060214
+commit: 84d4d62e95d521eced08ba506197ec86383ae53d
 

cockpit.spec

@@ -17,7 +17,7 @@
 
 #
 # This file is maintained at the following location:
-# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
+# https://github.com/cockpit-project/cockpit/blob/main/tools/cockpit.spec
 #
 # If you are editing this file in another location, changes will likely
 # be clobbered the next time an automated release is done.
@@ -54,7 +54,7 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        245
+Version:        250
 Release:        0
 Source0:        cockpit-%{version}.tar
 Source1:        cockpit.pam
@@ -64,6 +64,7 @@ Source98:       package-lock.json
 Source97:       node_modules.spec.inc
 %include        %{_sourcedir}/node_modules.spec.inc
 Patch0:         cockpit-redhatfont.diff
+Patch1:         0001-selinux-allow-login-to-read-motd-file.patch
 
 # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
 # and cockpit-appstream (building optional packages like cockpit-{pcp})
@@ -124,6 +125,8 @@ BuildRequires: libpcp_import1
 BuildRequires: openssh
 BuildRequires: distribution-logos
 BuildRequires: wallpaper-branding
+# needed for /var/lib/pcp directory ownership
+BuildRequires: pcp
 %else
 BuildRequires: pcp-libs-devel
 BuildRequires: openssh-clients
@@ -467,7 +470,6 @@ Recommends: (reportd >= 0.7.1 if abrt)
 %endif
 # NPM modules which are also available as packages
 Provides: bundled(js-jquery) = 3.5.1
-Provides: bundled(js-moment) = 2.29.1
 Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
 Provides: bundled(xstatic-patternfly-common) = 3.59.5
 
@@ -506,7 +508,6 @@ authentication via sssd/FreeIPA.
 %doc %{_mandir}/man8/cockpit-ws.8.gz
 %doc %{_mandir}/man8/cockpit-tls.8.gz
 %doc %{_mandir}/man8/remotectl.8.gz
-%doc %{_mandir}/man8/pam_cockpit_cert.8.gz
 %doc %{_mandir}/man8/pam_ssh_add.8.gz
 %dir %{_sysconfdir}/cockpit
 %config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d
@@ -587,6 +588,14 @@ fi
 # firewalld only partially picks up changes to its services files without this
 test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 
+# check for deprecated PAM config
+if grep --color=auto pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then
+    echo '**** WARNING:'
+    echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a'
+    echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.'
+    echo '**** WARNING:'
+fi
+
 %preun ws
 %systemd_preun cockpit.socket cockpit.service
 
@@ -737,7 +746,7 @@ This package contains files used to develop cockpit modules
 %package -n cockpit-pcp
 Summary: Cockpit PCP integration
 Requires: cockpit-bridge >= 238.1.1
-Requires(post): pcp
+Requires: pcp
 
 %description -n cockpit-pcp
 Cockpit support for reading PCP metrics and loading PCP archives.
@@ -755,6 +764,8 @@ BuildArch: noarch
 Requires: cockpit-bridge >= 186
 Requires: PackageKit
 Recommends: python3-tracer
+# HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468
+Requires: polkit
 
 %description -n cockpit-packagekit
 The Cockpit components for installing OS updates and Cockpit add-ons,