- change self-signed cert group from cockpit-wsintance to

cockpit-ws on upgrade

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=83

cockpit.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 31 15:30:24 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com>
+
+- change self-signed cert group from cockpit-wsintance to
+  cockpit-ws on upgrade
+
 -------------------------------------------------------------------
 Fri Jan 28 14:54:44 UTC 2022 - Adam Majer <adam.majer@suse.de>
 

cockpit.spec

@@ -1,36 +1,22 @@
 #
+# spec file for package cockpit
+#
+# Copyright (c) 2022 SUSE LLC
 # Copyright (C) 2014-2020 Red Hat, Inc.
 #
-# Cockpit is free software; you can redistribute it and/or modify it
+# All modifications and additions to the file contributed by third parties
-# under the terms of the GNU Lesser General Public License as published by
+# remain the property of their copyright owners, unless otherwise agreed
-# the Free Software Foundation; either version 2.1 of the License, or
+# upon. The license for this file, and modifications and additions to the
-# (at your option) any later version.
+# file, is the same license as for the pristine package itself (unless the
-#
+# license for the pristine package is not an Open Source License, in which
-# Cockpit is distributed in the hope that it will be useful, but
+# case the license is the MIT License). An "Open Source License" is a
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+# license that conforms to the Open Source Definition (Version 1.9)
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# published by the Open Source Initiative.
-# Lesser General Public License for more details.
+
-#
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
-# You should have received a copy of the GNU Lesser General Public License
-# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
 #
 
-#
-# This file is maintained at the following location:
-# 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.
-#
-# Check first cockpit-devel@lists.fedorahosted.org
-#
-# Globals that may be defined elsewhere
-#  * Version 122
-#  * wip 1
-#
 
-# earliest base that the subpackages work on; the instances of this get computed/updated
-# by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
 %define required_base 122
 
 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
@@ -93,47 +79,48 @@ Patch1:         0001-selinux-allow-login-to-read-motd-file.patch
 %endif
 
 BuildRequires:  gcc
+BuildRequires:  pam-devel
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(polkit-agent-1) >= 0.105
-BuildRequires: pam-devel
 
-BuildRequires: autoconf automake
-BuildRequires: make
 BuildRequires:  /usr/bin/python3
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gettext >= 0.19.7
+BuildRequires:  make
 %if 0%{?build_basic}
 BuildRequires:  libssh-devel >= 0.8.5
 %endif
-BuildRequires: openssl-devel
+BuildRequires:  glib-networking
 BuildRequires:  gnutls-devel >= 3.4.3
+BuildRequires:  libxslt-devel
+BuildRequires:  openssl-devel
+BuildRequires:  sed
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(krb5) >= 1.11
-BuildRequires: libxslt-devel
-BuildRequires: glib-networking
-BuildRequires: sed
 
 BuildRequires:  glib2-devel >= 2.50.0
 # this is for runtimedir in the tls proxy ace21c8879
 BuildRequires:  pkgconfig(libsystemd) >= 235
 %if 0%{?suse_version}
+BuildRequires:  distribution-logos
 BuildRequires:  distribution-release
 BuildRequires:  libpcp-devel
-BuildRequires: pcp-devel
 BuildRequires:  libpcp3
 BuildRequires:  libpcp_import1
 BuildRequires:  openssh
-BuildRequires: distribution-logos
+BuildRequires:  pcp-devel
 BuildRequires:  wallpaper-branding
 # needed for /var/lib/pcp directory ownership
 BuildRequires:  pcp
 %else
-BuildRequires: pcp-libs-devel
-BuildRequires: openssh-clients
 BuildRequires:  docbook-style-xsl
+BuildRequires:  openssh-clients
+BuildRequires:  pcp-libs-devel
 %endif
-BuildRequires: krb5-server
 BuildRequires:  gdb
+BuildRequires:  krb5-server
 
 # For documentation
 BuildRequires:  xmlto
@@ -146,15 +133,15 @@ BuildRequires:  selinux-policy-devel
 
 # for rebuilding nodejs bits
 BuildRequires:  npm
-BuildRequires: sassc
 BuildRequires:  local-npm-registry
+BuildRequires:  sassc
 
 # This is the "cockpit" metapackage. It should only
 # Require, Suggest or Recommend other cockpit-xxx subpackages
 
 Requires:       cockpit-bridge
-Requires: cockpit-ws
 Requires:       cockpit-system
+Requires:       cockpit-ws
 
 # Optional components
 Recommends:     (cockpit-storaged if udisks2)
@@ -396,7 +383,6 @@ troubleshooting, interactive command-line sessions, and more.
 %{_datadir}/pixmaps/cockpit.png
 %doc %{_mandir}/man1/cockpit.1.gz
 
-
 %package bridge
 Summary:        Cockpit bridge server-side component
 Requires:       glib-networking
@@ -405,11 +391,11 @@ Provides: cockpit-ssh = %{version}-%{release}
 Conflicts:      cockpit-ws < 181.x
 # 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
 Conflicts:      cockpit-dashboard < 233
+Conflicts:      cockpit-docker < 233
 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
@@ -442,9 +428,9 @@ Requires: cockpit-bridge >= %{version}-%{release}
 %if !0%{?suse_version}
 Requires:       shadow-utils
 %endif
-Requires: grep
-Requires: /usr/bin/pwscore
 Requires:       /usr/bin/date
+Requires:       /usr/bin/pwscore
+Requires:       grep
 Provides:       cockpit-shell = %{version}-%{release}
 Provides:       cockpit-systemd = %{version}-%{release}
 Provides:       cockpit-tuned = %{version}-%{release}
@@ -455,10 +441,10 @@ Provides: cockpit-networkmanager = %{version}-%{release}
 Requires:       NetworkManager >= 1.6
 Provides:       cockpit-kdump = %{version}-%{release}
 Requires:       kexec-tools
-Recommends: (sudo or polkit)
-Recommends: PackageKit
 Recommends:     NetworkManager-team
+Recommends:     PackageKit
 Recommends:     setroubleshoot-server >= 3.3.3
+Recommends:     (sudo or polkit)
 Provides:       cockpit-selinux = %{version}-%{release}
 Provides:       cockpit-sosreport = %{version}-%{release}
 Requires:       sos
@@ -482,8 +468,8 @@ This package contains the Cockpit shell and system configuration interfaces.
 %package ws
 Summary:        Cockpit Web Service
 Requires:       glib-networking
-Requires: openssl
 Requires:       glib2 >= 2.50.0
+Requires:       openssl
 %if 0%{?with_selinux}
 Requires:       (selinux-policy >= %{selinux_policy_version} if selinux-policy-%{selinuxtype})
 Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
@@ -580,6 +566,12 @@ if [ "$1" = 1 ]; then
     ln -s /run/cockpit/motd /etc/motd.d/cockpit
     ln -s /run/cockpit/motd /etc/issue.d/cockpit.issue
 fi
+# switch old self-signed cert group from cockpit-wsintance to cockpit-ws on upgrade
+if [ "$1" = 2 ]; then
+    certfile=/etc/cockpit/ws-certs.d/0-self-signed.cert
+    test -f $certfile && stat -c '%G' $certfile | grep -q cockpit-wsinstance && chgrp cockpit-ws $certfile
+fi
+
 %if 0%{?suse_version}
 %set_permissions %{_libexecdir}/cockpit-session
 %endif
@@ -650,9 +642,9 @@ sosreport tool.
 
 %package networkmanager
 Summary:        Cockpit user interface for networking, using NetworkManager
+Requires:       NetworkManager >= 1.6
 Requires:       cockpit-bridge >= 186
 Requires:       cockpit-shell >= 186
-Requires: NetworkManager >= 1.6
 # Optional components
 Recommends:     NetworkManager-team
 BuildArch:      noarch
@@ -701,10 +693,10 @@ Dummy package from building optional packages only; never install or publish me.
 Summary:        Cockpit user interface for storage, using udisks
 Requires:       cockpit-shell >= 186
 Requires:       udisks2 >= 2.6
-Recommends: udisks2-lvm2 >= 2.6
-Recommends: udisks2-iscsi >= 2.6
-Recommends: device-mapper-multipath
 Recommends:     clevis-luks
+Recommends:     device-mapper-multipath
+Recommends:     udisks2-iscsi >= 2.6
+Recommends:     udisks2-lvm2 >= 2.6
 Requires:       %{__python3}
 %if 0%{?suse_version}
 Requires:       python3-dbus-python
@@ -761,8 +753,8 @@ systemctl reload-or-try-restart pmlogger
 %package -n cockpit-packagekit
 Summary:        Cockpit user interface for packages
 BuildArch:      noarch
-Requires: cockpit-bridge >= 186
 Requires:       PackageKit
+Requires:       cockpit-bridge >= 186
 Recommends:     python3-tracer
 # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468
 Requires:       polkit
@@ -776,5 +768,4 @@ via PackageKit.
 #/ build optional extension packages
 %endif
 
-# The changelog is automatically generated and merged
 %changelog