diff --git a/.cockpit.metadata b/.cockpit.metadata
index 2246216..04897ea 100644
--- a/.cockpit.metadata
+++ b/.cockpit.metadata
@@ -1 +1 @@
-ff7fe2d588c3fe081aea901320cd8f69b2e08959 SOURCES/cockpit-233.1.tar.xz
+4455adcaaa7d0a6845e37e72df38b48e0f6074c1 SOURCES/cockpit-234.tar.xz
diff --git a/.gitignore b/.gitignore
index 4dbc508..8406f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-233.1.tar.xz
+SOURCES/cockpit-234.tar.xz
diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index 7745d24..d900ace 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -1,5 +1,5 @@
# This spec file has been automatically updated
-Version: 233.1
+Version: 234
Release: 1%{?dist}
#
# Copyright (C) 2014-2020 Red Hat, Inc.
@@ -68,7 +68,8 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v
# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
# and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
-%if 0%{?rhel}
+# This split does not apply to EPEL/COPR.
+%if 0%{?rhel} && 0%{?epel} == 0
%if "%{name}" == "cockpit"
%define build_basic 1
@@ -208,9 +209,6 @@ echo '%dir %{_datadir}/cockpit/ssh' >> base.list
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
echo '%{_libexecdir}/cockpit-ssh' >> base.list
-echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list
-find %{buildroot}%{_datadir}/cockpit/dashboard -type f >> dashboard.list
-
echo '%dir %{_datadir}/cockpit/pcp' >> pcp.list
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
@@ -280,7 +278,7 @@ rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
# when not building optional packages, remove their files
%if 0%{?build_optional} == 0
-for pkg in apps dashboard machines packagekit pcp playground storaged; do
+for pkg in apps machines packagekit pcp playground storaged; do
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
done
# files from -tests
@@ -364,8 +362,6 @@ troubleshooting, interactive command-line sessions, and more.
Summary: Cockpit bridge server-side component
Requires: glib-networking
Provides: cockpit-ssh = %{version}-%{release}
-# cockpit-ssh moved from dashboard to bridge in 171
-Conflicts: cockpit-dashboard < 170.x
# PR #10430 dropped workaround for ws' inability to understand x-host-key challenge
Conflicts: cockpit-ws < 181.x
# 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
@@ -374,6 +370,7 @@ Conflicts: cockpit-networkmanager < 233
Conflicts: cockpit-storaged < 233
Conflicts: cockpit-system < 233
Conflicts: cockpit-tests < 233
+Conflicts: cockpit-docker < 233
%description bridge
The Cockpit bridge component installed server side and runs commands on the
@@ -426,6 +423,7 @@ Recommends: setroubleshoot-server >= 3.3.3
Provides: cockpit-selinux = %{version}-%{release}
Provides: cockpit-sosreport = %{version}-%{release}
Requires: sos
+Obsoletes: cockpit-dashboard
%endif
%if 0%{?fedora} >= 29
# 0.7.0 (actually) supports task cancellation.
@@ -681,17 +679,6 @@ Cockpit support for reading PCP metrics and loading PCP archives.
%post -n cockpit-pcp
systemctl reload-or-try-restart pmlogger
-%package -n cockpit-dashboard
-Summary: Cockpit remote server dashboard
-BuildArch: noarch
-Requires: cockpit-ssh >= 135
-Conflicts: cockpit-ws < 135
-
-%description -n cockpit-dashboard
-Cockpit page for showing performance graphs for up to 20 remote servers.
-
-%files -n cockpit-dashboard -f dashboard.list
-
%package -n cockpit-packagekit
Summary: Cockpit user interface for packages
BuildArch: noarch
@@ -709,6 +696,10 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
+* Mon Dec 14 2020 Katerina Koukiou <kkoukiou@redhat.com> - 234-1
+- Improved login page
+- Improved bridge code after feedback from recent coverity scanning
+
* Fri Nov 27 2020 Katerina Koukiou <kkoukiou@redht.com> - 233.1-1
- Non-admin users no longer see Cockpit in motd (rhbz#1872562)
- Improved host editing