From cb5a0ad5e828da7295e47244dd910845305b8493 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 20 2020 14:23:43 +0000
Subject: import cockpit-195.8-1.el7


---

diff --git a/.cockpit.metadata b/.cockpit.metadata
index b373cab..c0f4cf6 100644
--- a/.cockpit.metadata
+++ b/.cockpit.metadata
@@ -1 +1 @@
-19c0f1644fe83f37177be009a93e942d2c5f5dda SOURCES/cockpit-195.3.tar.xz
+b61ae40bbd70b3f57159963aa2ac474e88b74771 SOURCES/cockpit-195.8.tar.xz
diff --git a/.gitignore b/.gitignore
index d46087c..704bc0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-195.3.tar.xz
+SOURCES/cockpit-195.8.tar.xz
diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index 70c8c52..564b1f0 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        195.3
+Version:        195.8
 Release: 1%{?dist}
 #
 # This file is maintained at the following location:
@@ -59,11 +59,15 @@ Release: 1%{?dist}
 %define build_subscriptions 1
 %endif
 
-# cockpit-kubernetes is RHEL 7 and Fedora < 30 only, and 64 bit arches only
-%if (0%{?fedora} && 0%{?fedora} < 30) || (0%{?rhel} >= 7 && 0%{?rhel} < 8)
+# cockpit-kubernetes is 64 bit arches only
 %ifarch aarch64 x86_64 ppc64le s390x
 %define build_kubernetes 1
-%endif
+# the primary go-toolset-7-golang is too old (unfixed CVEs), use latest one
+%global go_scl_prefix go-toolset-1.12-
+# go-toolset-1.12-golang doesn't have "go" in $PATH
+%define golang_def GOLANG=/opt/rh/go-toolset-1.12/root/usr/lib/go-toolset-1.12-golang/bin/go
+%else
+%define golang_def
 %endif
 
 # cockpit-machines-ovirt is RHEL 7 and Fedora < 30 only
@@ -72,13 +76,8 @@ Release: 1%{?dist}
 %endif
 
 %if 0%{?rhel} >= 7
-%global go_scl_prefix go-toolset-7-
-%else
-%global go_scl_prefix %{nil}
-%endif
-
-%if 0%{?rhel} >= 7
 %define vdo_on_demand 1
+%define insights_client_on_demand 1
 %endif
 
 Name:           cockpit
@@ -164,6 +163,7 @@ Suggests: cockpit-selinux
 %build
 exec 2>&1
 %configure \
+    %{golang_def} \
     --disable-silent-rules \
     --with-cockpit-user=cockpit-ws \
     --with-selinux-config-type=etc_t \
@@ -173,7 +173,8 @@ exec 2>&1
     --with-appstream-data-packages='[ "appstream-data" ]' \
     %{!?build_dashboard:--disable-ssh} \
     --with-nfs-client-package='"nfs-utils"' \
-    %{?vdo_on_demand:--with-vdo-package='"vdo"'}
+    %{?vdo_on_demand:--with-vdo-package='"vdo"'} \
+    %{?insights_client_on_demand:--with-insights-client-package='"insights-client"'}
 make -j4 %{?extra_flags} all
 
 %check
@@ -691,8 +692,10 @@ Requires: libvirt
 Requires: (libvirt-daemon-kvm or libvirt)
 %endif
 Requires: libvirt-client
-%if 0%{?fedora} || 0%{?rhel} >= 8
+%if 0%{?centos} == 0
 Requires: libvirt-dbus >= 1.2.0
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 8
 # Optional components
 Recommends: virt-install
 Recommends: libosinfo
@@ -834,6 +837,22 @@ via PackageKit.
 %endif # build optional extension packages
 
 %changelog
+* Thu Mar 26 2020 Martin Pitt <mpitt@redhat.com> 195.8-1
+- webserver: Fix large requests with TLS (rhbz#1785497)
+- Machines: Avoid D-Bus introspection to libvirt-dbus, to speed up polkit
+  operations (rhbz#1780400)
+- Machines: Fix CPU statistics (rhbz#1763641)
+
+* Thu Dec 12 2019 Martin Pitt <mpitt@redhat.com> 195.6-1
+- subscriptions: Avoid PackageKit when installing insights-client
+  (rhbz#1768917)
+
+* Thu Nov 07 2019 Martin Pitt <mpitt@redhat.com> 195.5-1
+- subscriptions: Install insights-client on demand (rhbz#1768917)
+
+* Wed Oct 16 2019 Martin Pitt <mpitt@redhat.com> 195.4-1
+- Update translations (rhbz#1733994)
+
 * Mon Sep 09 2019 Martin Pitt <mpitt@redhat.com> 195.3-1
 - subscriptions: Add support for Red Hat Insights (rhbz#1748026)
 - systemd: Warn if not connected to Insights (rhbz#1748350)