import cockpit-appstream-211.3-1.el8

.cockpit-appstream.metadata

@@ -1 +1 @@
-ba6d222ec1115455d8670de907de08bf98a1b42e SOURCES/cockpit-197.3.tar.xz
+d2296e9e881f359d901ac3f73f471d056497d91b SOURCES/cockpit-211.3.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/cockpit-197.3.tar.xz
+SOURCES/cockpit-211.3.tar.xz

SOURCES/0001-test-Fix-rhsmd-cleanup-in-check-packagekit.patch

@@ -1,27 +0,0 @@
-From 09c7c37d2ac2e6ff6c8259bd2d99dceec6a46d4c Mon Sep 17 00:00:00 2001
-From: Martin Pitt <mpitt@redhat.com>
-Date: Thu, 5 Sep 2019 11:11:18 +0200
-Subject: [PATCH] test: Fix rhsmd cleanup in check-packagekit
-
-When disabling /usr/libexec/rhsmd (on RHEL images), re-enable it at the
-end of the test. This unbreaks running more than one check-packagekit
-test on an external testbed.
----
- test/verify/check-packagekit | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/verify/check-packagekit b/test/verify/check-packagekit
-index 47641875f..415aa9565 100755
---- a/test/verify/check-packagekit
-+++ b/test/verify/check-packagekit
-@@ -48,6 +48,7 @@
-         # On other OSes (Fedora/CentOS) we expect sub-man to be disabled in yum, so it should not get in the way there
-         if self.machine.image.startswith("rhel"):
-             self.machine.execute("mv /usr/libexec/rhsmd /usr/libexec/rhsmd.disabled")
-+            self.addCleanup(self.machine.execute, "mv /usr/libexec/rhsmd.disabled /usr/libexec/rhsmd")
- 
-         # only the yum backend properly recognizes "enhancement" severity; apt
-         # does not have that metadata and PackageKit-dnf does not parse it
--- 
-2.21.0
-

SPECS/cockpit-appstream.spec

@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        197.3
+Version:        211.3
 Release: 1%{?dist}
 #
 # This file is maintained at the following location:
@@ -61,7 +61,6 @@ Source0:        cockpit-%{version}.tar.gz
 %else
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 %endif
-Patch0001:      0001-test-Fix-rhsmd-cleanup-in-check-packagekit.patch
 
 BuildRequires: gcc
 BuildRequires: pkgconfig(gio-unix-2.0)
@@ -71,21 +70,21 @@ BuildRequires: pam-devel
 
 BuildRequires: autoconf automake
 BuildRequires: /usr/bin/python3
-BuildRequires: intltool
+BuildRequires: gettext >= 0.19.7
 %if %{defined build_dashboard}
-BuildRequires: libssh-devel >= 0.7.1
+BuildRequires: libssh-devel >= 0.8
 %endif
 BuildRequires: openssl-devel
-BuildRequires: gnutls-devel
+BuildRequires: gnutls-devel >= 3.4.3
 BuildRequires: zlib-devel
-BuildRequires: krb5-devel
+BuildRequires: krb5-devel >= 1.11
 BuildRequires: libxslt-devel
 BuildRequires: docbook-style-xsl
 BuildRequires: glib-networking
 BuildRequires: sed
 
 BuildRequires: glib2-devel >= 2.37.4
-BuildRequires: systemd-devel
+BuildRequires: systemd-devel >= 235
 BuildRequires: pcp-libs-devel
 BuildRequires: krb5-server
 BuildRequires: gdb
@@ -110,19 +109,22 @@ Recommends: (cockpit-docker if /usr/bin/docker)
 Recommends: (cockpit-networkmanager if NetworkManager)
 Recommends: (cockpit-storaged if udisks2)
 Recommends: cockpit-packagekit
-Recommends: subscription-manager-cockpit
 Suggests: cockpit-pcp
 Suggests: cockpit-selinux
 %endif
+%if 0%{?rhel} && 0%{?centos} == 0
+Recommends: subscription-manager-cockpit
+%endif
 
 %prep
-%autosetup -S patch -p1 -n cockpit-%{version}
+%setup -q -n cockpit-%{version}
 
 %build
 exec 2>&1
 %configure \
     --disable-silent-rules \
     --with-cockpit-user=cockpit-ws \
+    --with-cockpit-ws-instance-user=cockpit-wsinstance \
     --with-selinux-config-type=etc_t \
     --with-appstream-data-packages='[ "appstream-data" ]' \
     --with-nfs-client-package='"nfs-utils"' \
@@ -162,9 +164,6 @@ touch dashboard.list
 echo '%dir %{_datadir}/cockpit/pcp' >> pcp.list
 find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
 
-echo '%dir %{_datadir}/cockpit/realmd' >> system.list
-find %{buildroot}%{_datadir}/cockpit/realmd -type f >> system.list
-
 echo '%dir %{_datadir}/cockpit/tuned' >> system.list
 find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list
 
@@ -219,7 +218,7 @@ touch docker.list
 
 # when not building basic packages, remove their files
 %if 0%{?build_basic} == 0
-for pkg in base1 branding motd kdump networkmanager realmd selinux shell sosreport ssh static systemd tuned users; do
+for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users; do
     rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
     rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
 done
@@ -229,7 +228,7 @@ done
 for lib in systemd tmpfiles.d firewalld; do
     rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib
 done
-for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-desktop; do
+for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop; do
     rm %{buildroot}/%{_libexecdir}/$libexec
 done
 rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
@@ -350,7 +349,6 @@ Requires: shadow-utils
 Requires: grep
 Requires: libpwquality
 Requires: /usr/bin/date
-Provides: cockpit-realmd = %{version}-%{release}
 Provides: cockpit-shell = %{version}-%{release}
 Provides: cockpit-systemd = %{version}-%{release}
 Provides: cockpit-tuned = %{version}-%{release}
@@ -358,7 +356,7 @@ Provides: cockpit-users = %{version}-%{release}
 %if 0%{?rhel}
 Provides: cockpit-networkmanager = %{version}-%{release}
 Obsoletes: cockpit-networkmanager
-Requires: NetworkManager
+Requires: NetworkManager >= 1.6
 Provides: cockpit-kdump = %{version}-%{release}
 Requires: kexec-tools
 Recommends: polkit
@@ -367,12 +365,17 @@ Recommends: setroubleshoot-server >= 3.3.3
 Provides: cockpit-selinux = %{version}-%{release}
 Provides: cockpit-sosreport = %{version}-%{release}
 %endif
+%if 0%{?fedora} >= 29
+# 0.7.0 (actually) supports task cancellation.
+# 0.7.1 fixes tasks never announcing completion.
+Recommends: (reportd >= 0.7.1 if abrt)
+%endif
 # NPM modules which are also available as packages
 Provides: bundled(js-jquery) = 3.4.1
 Provides: bundled(js-moment) = 2.24.0
 Provides: bundled(nodejs-flot) = 0.8.3
 Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
-Provides: bundled(xstatic-patternfly-common) = 3.58.0
+Provides: bundled(xstatic-patternfly-common) = 3.59.4
 
 %description system
 This package contains the Cockpit shell and system configuration interfaces.
@@ -387,6 +390,8 @@ Requires: glib2 >= 2.37.4
 Conflicts: firewalld < 0.6.0-1
 Recommends: sscg >= 2.3
 Recommends: system-logos
+Requires: systemd >= 235
+Suggests: sssd-dbus
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -394,11 +399,16 @@ Requires(postun): systemd
 %description ws
 The Cockpit Web Service listens on the network, and authenticates users.
 
+If sssd-dbus is installed, you can enable client certificate/smart card
+authentication via sssd/FreeIPA.
+
 %files ws -f cockpit.lang
 %doc %{_mandir}/man1/cockpit-desktop.1.gz
 %doc %{_mandir}/man5/cockpit.conf.5.gz
 %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
 %config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d
 %config(noreplace) %{_sysconfdir}/pam.d/cockpit
@@ -409,19 +419,33 @@ The Cockpit Web Service listens on the network, and authenticates users.
 %{_unitdir}/cockpit.service
 %{_unitdir}/cockpit-motd.service
 %{_unitdir}/cockpit.socket
+%{_unitdir}/cockpit-wsinstance-http.socket
+%{_unitdir}/cockpit-wsinstance-http.service
+%{_unitdir}/cockpit-wsinstance-http-redirect.socket
+%{_unitdir}/cockpit-wsinstance-http-redirect.service
+%{_unitdir}/cockpit-wsinstance-https-factory.socket
+%{_unitdir}/cockpit-wsinstance-https-factory@.service
+%{_unitdir}/cockpit-wsinstance-https@.socket
+%{_unitdir}/cockpit-wsinstance-https@.service
+%{_unitdir}/system-cockpithttps.slice
 %{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf
 %{_sbindir}/remotectl
 %{_libdir}/security/pam_ssh_add.so
+%{_libdir}/security/pam_cockpit_cert.so
 %{_libexecdir}/cockpit-ws
+%{_libexecdir}/cockpit-wsinstance-factory
+%{_libexecdir}/cockpit-tls
 %{_libexecdir}/cockpit-desktop
-%attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session
+%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
 %attr(775, -, wheel) %{_localstatedir}/lib/cockpit
 %{_datadir}/cockpit/static
 %{_datadir}/cockpit/branding
 
 %pre ws
 getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws
-getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws" cockpit-ws
+getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d /nonexisting -s /sbin/nologin -c "User for cockpit web service" cockpit-ws
+getent group cockpit-wsinstance >/dev/null || groupadd -r cockpit-wsinstance
+getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance
 
 %post ws
 %systemd_post cockpit.socket
@@ -470,9 +494,9 @@ sosreport tool.
 
 %package networkmanager
 Summary: Cockpit user interface for networking, using NetworkManager
-Requires: cockpit-bridge >= 122
+Requires: cockpit-bridge >= 186
-Requires: cockpit-shell >= 122
+Requires: cockpit-shell >= 186
-Requires: NetworkManager
+Requires: NetworkManager >= 1.6
 # Optional components
 Recommends: NetworkManager-team
 BuildArch: noarch
@@ -517,7 +541,7 @@ Dummy package from building optional packages only; never install or publish me.
 
 %package -n cockpit-storaged
 Summary: Cockpit user interface for storage, using udisks
-Requires: cockpit-shell >= 122
+Requires: cockpit-shell >= 186
 Requires: udisks2 >= 2.6
 Recommends: udisks2-lvm2 >= 2.6
 Recommends: udisks2-iscsi >= 2.6
@@ -551,8 +575,8 @@ These files are not required for running Cockpit.
 %package -n cockpit-machines
 BuildArch: noarch
 Summary: Cockpit user interface for virtual machines
-Requires: cockpit-bridge >= 122
+Requires: cockpit-bridge >= 186
-Requires: cockpit-system >= 122
+Requires: cockpit-system >= 186
 Requires: libvirt-daemon-kvm
 Requires: libvirt-client
 Requires: libvirt-dbus >= 1.2.0
@@ -608,8 +632,7 @@ bastion hosts, and a basic dashboard.
 Summary: Cockpit user interface for Docker containers
 Requires: cockpit-bridge >= 122
 Requires: cockpit-shell >= 122
-Requires: /usr/bin/docker
+Requires: (docker or moby-engine or docker-ce)
-Requires: /usr/lib/systemd/system/docker.service
 Requires: %{__python3}
 
 %description -n cockpit-docker
@@ -624,7 +647,7 @@ This package is not yet complete.
 %package -n cockpit-packagekit
 Summary: Cockpit user interface for packages
 BuildArch: noarch
-Requires: cockpit-bridge >= 138
+Requires: cockpit-bridge >= 186
 Requires: PackageKit
 
 %description -n cockpit-packagekit
@@ -637,6 +660,59 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Mar 12 2020 Martin Pitt <mpitt@redhat.com> - 211.3-1
+- Fix CJK translations (rhbz#1807333)
+
+* Wed Feb 19 2020 Martin Pitt <mpitt@redhat.com> - 211.2.1
+- Machines: Fix stuck delete dialogs (rhbz#1791543, #1792379)
+- Machines: Fix CPU statistics (rhbz#1763641)
+- Machines: Fix incorrect format when adding existing disk to VM (rhbz#1792319)
+- Storage: Minor layout fixes
+- Translation updates
+
+* Thu Jan 23 2020 Matej Marusak <mmarusak@redhat.com> - 211-1
+- Machines: The VM is covered when another one has the same name (rhbz#1780451)
+- Machines: Decompress ipv6 addresses before validating them (rhbz#1784289)
+- Machines: Fix default bridge selection for `Bridge to LAN` NIC (rhbz#1791537, rhbz#1791543)
+
+* Thu Jan 09 2020 Matej Marusak <mmarusak@redhat.com> - 210-1
+- Dashboard: Support SSH identity unlocking when adding new machines
+- Machines: Support “bridge” type network interfaces
+- Machines: Support “bus” type disk configuration (rhbz#1671144)
+- Machines: Fix default storage pool search (rhbz#1778049)
+- Machines: Fix lost of configuration changes made before installation (rhbz#1780449)
+- Machines: Fix edit NIC dialog when the current network in XML was deleted (rhbz#1780452)
+- Machines: Fix default volume format detection in Disk Add dialog (rhbz#1784304)
+- Machines: Use all cells when getting Host Max Memory (rhbz#1780530)
+
+* Fri Dec 13 2019 Matej Marusak <mmarusak@redhat.com> - 209-1
+- Machines: Don't disable detaching button when VM is running (rhbz#1777201)
+- Machines: Support transient virtual networks and storage pools (rhbz#1715429)
+- Machines: Fix Oops when creating a VM from ISO on system with no storage pools (rhbz#1778049)
+- Stop fetching variables from base1/patternfly.css because they can be outdated (rhbz#1777683)
+
+
+* Thu Nov 28 2019 Matej Marusak <mmarusak@redhat.com> - 208-1
+- Storage: Drop “default mount point” concept
+- Machines: Support transient virtual networks and storage pools
+- Machines: Sliders for disk size and memory in VM creation
+- Storage: List all software devices in a single panel
+- Redesigned notifications
+
+* Wed Nov 13 2019 Matej Marusak <mmarusak@redhat.com> - 206-1
+- Machines: Network interface deletion
+- Machines: Refactor Create VM dialog and introduce a download option
+- Software Updates: Use notifications for available updates info
+- Machines: Configure read-only and shareable disks (rhbz#1684304)
+- machines: Implement adding virtual network interfaces (rhbz#1672753)
+- Machines: Creation of Storage Volumes (rhbz#1676506)
+- Machines: VM creation and import dialog changes
+- Machines: Enable interface type "direct" in NIC configuration
+- Machines: LVM storage pools (rhbz#1676600)
+- Machines: VM creation dialog now shows the recommended memory for the selected OS
+- Machines: Managing of Virtual Networks (rhbz#1672755)
+- Machines: Support more disk types
+
 * Mon Sep 09 2019 Martin Pitt <mpitt@redhat.com> - 197.3-1
 - Machines: Fix race condition with handling *EVENT_UNDEFINED (rhbz#1715388)