Update to 198-1

- PatternFly4 user interface design
- SELinux: Show changes
- Machines: Deletion of Virtual Networks
- Machines: Support more disk types
- Docker: Change menu label
- Web server: More flexible https redirection for proxies

.gitignore

@@ -151,3 +151,4 @@
 /cockpit-192.tar.xz
 /cockpit-193.tar.xz
 /cockpit-194.tar.xz
+/cockpit-198.tar.xz

cockpit.spec

@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        194
+Version:        198
 Release: 1%{?dist}
 #
 # This file is maintained at the following location:
@@ -44,40 +44,9 @@ Release: 1%{?dist}
 # build optional extensions like cockpit-docker
 %define build_optional 1
 
-# cockpit's firewall service definition moved to firewalld
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
-%define firewalld_service 0
-%else
-%define firewalld_service 1
-%endif
-
 %define __lib lib
 
-# on RHEL 7.x we build subscriptions; superseded later by
+%if 0%{?rhel}
-# external subscription-manager-cockpit
-%if (0%{?rhel} >= 7 && 0%{?rhel} < 8) && 0%{?centos} == 0
-%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)
-%ifarch aarch64 x86_64 ppc64le s390x
-%define build_kubernetes 1
-%endif
-%endif
-
-# cockpit-machines-ovirt is RHEL 7 and Fedora < 30 only
-%if (0%{?fedora} && 0%{?fedora} < 30) || (0%{?rhel} >= 7 && 0%{?rhel} < 8)
-%define build_ovirt 1
-%endif
-
-%if 0%{?rhel} >= 8
-%global go_scl_prefix go-toolset-7-
-%else
-%global go_scl_prefix %{nil}
-%endif
-
-%if 0%{?rhel} >= 7
 %define vdo_on_demand 1
 %endif
 
@@ -100,29 +69,26 @@ BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
 BuildRequires: pam-devel
 
 BuildRequires: autoconf automake
-%if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires: /usr/bin/python3
-%else
-BuildRequires: /usr/bin/python2
-%endif
 BuildRequires: intltool
 %if %{defined build_dashboard}
 BuildRequires: libssh-devel >= 0.7.1
 %endif
 BuildRequires: openssl-devel
+BuildRequires: gnutls-devel
 BuildRequires: zlib-devel
 BuildRequires: krb5-devel
 BuildRequires: libxslt-devel
 BuildRequires: docbook-style-xsl
 BuildRequires: glib-networking
 BuildRequires: sed
-BuildRequires: git
 
 BuildRequires: glib2-devel >= 2.37.4
 BuildRequires: systemd-devel
 BuildRequires: pcp-libs-devel
 BuildRequires: krb5-server
 BuildRequires: gdb
+BuildRequires: openssh-clients
 
 # For documentation
 BuildRequires: xmlto
@@ -135,52 +101,30 @@ Requires: cockpit-ws
 Requires: cockpit-system
 
 # Optional components
-%if 0%{?fedora} || 0%{?rhel} >= 8
 %if 0%{?rhel} == 0
 Recommends: cockpit-dashboard
 %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
 Recommends: (cockpit-docker if /usr/bin/docker)
 %endif
-%endif
 Recommends: (cockpit-networkmanager if NetworkManager)
 Recommends: (cockpit-storaged if udisks2)
 Recommends: cockpit-packagekit
-%if 0%{?rhel} >= 8 && 0%{?centos} == 0
-Recommends: subscription-manager-cockpit
-%endif
 Suggests: cockpit-pcp
-%if 0%{?build_kubernetes}
-Suggests: cockpit-kubernetes
-%endif
 Suggests: cockpit-selinux
 %endif
+%if 0%{?rhel} && 0%{?centos} == 0
+Recommends: subscription-manager-cockpit
+%endif
 
 %prep
 %setup -q -n cockpit-%{version}
 
-# Apply patches using git in order to support binary patches. Note that
-# we also reset mtimes since patches should be "complete" and include both
-# generated and source file changes
-# Keep this in sync with tools/debian/rules.
-if [ -n "%{patches}" ]; then
-    git init
-    git config user.email "unused@example.com" && git config user.name "Unused"
-    git config core.autocrlf false && git config core.safecrlf false && git config gc.auto 0
-    git add -f . && git commit -a -q -m "Base" && git tag -a initial --message="initial"
-    git am --whitespace=nowarn %{patches}
-    touch -r $(git diff --name-only initial..HEAD) .git Makefile.in
-    rm -rf .git
-fi
-
 %build
 exec 2>&1
 %configure \
     --disable-silent-rules \
     --with-cockpit-user=cockpit-ws \
     --with-selinux-config-type=etc_t \
-%if 0%{?rhel} >= 7 && 0%{?rhel} < 8
-    --without-storaged-iscsi-sessions \
-%endif
     --with-appstream-data-packages='[ "appstream-data" ]' \
     --with-nfs-client-package='"nfs-utils"' \
     %{?vdo_on_demand:--with-vdo-package='"vdo"'}
@@ -196,29 +140,17 @@ make install-tests DESTDIR=%{buildroot}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
 rm -f %{buildroot}/%{_libdir}/cockpit/*.so
-%if 0%{?firewalld_service} == 0
+# shipped in firewalld since 0.6, everywhere in Fedora/RHEL 8
 rm -f %{buildroot}/%{_prefix}/%{__lib}/firewalld/services/cockpit.xml
-%endif
 install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
 
-# On RHEL we don't yet show options for changing language
-%if 0%{?rhel}
-echo '{ "linguas": null }' > %{buildroot}%{_datadir}/cockpit/shell/override.json
-%endif
-
 # Build the package lists for resource packages
 echo '%dir %{_datadir}/cockpit/base1' > base.list
 find %{buildroot}%{_datadir}/cockpit/base1 -type f >> base.list
 echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
 echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
-# RHEL 7 needs to keep cockpit-ssh in dashboard for backwards compat
-%if 0%{?rhel} == 7
-find %{buildroot}%{_datadir}/cockpit/ssh -type f >> dashboard.list
-echo '%{_libexecdir}/cockpit-ssh' >> dashboard.list
-%else
 find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
 echo '%{_libexecdir}/cockpit-ssh' >> base.list
-%endif
 
 %if %{defined build_dashboard}
 echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list
@@ -252,13 +184,6 @@ find %{buildroot}%{_datadir}/cockpit/kdump -type f >> kdump.list
 echo '%dir %{_datadir}/cockpit/sosreport' > sosreport.list
 find %{buildroot}%{_datadir}/cockpit/sosreport -type f >> sosreport.list
 
-%if %{defined build_subscriptions}
-echo '%dir %{_datadir}/cockpit/subscriptions' >> system.list
-find %{buildroot}%{_datadir}/cockpit/subscriptions -type f >> system.list
-%else
-rm -rf %{buildroot}/%{_datadir}/cockpit/subscriptions
-%endif
-
 echo '%dir %{_datadir}/cockpit/storaged' > storaged.list
 find %{buildroot}%{_datadir}/cockpit/storaged -type f >> storaged.list
 
@@ -274,14 +199,6 @@ find %{buildroot}%{_datadir}/cockpit/apps -type f >> packagekit.list
 echo '%dir %{_datadir}/cockpit/machines' > machines.list
 find %{buildroot}%{_datadir}/cockpit/machines -type f >> machines.list
 
-%if 0%{?build_ovirt}
-echo '%dir %{_datadir}/cockpit/ovirt' > ovirt.list
-find %{buildroot}%{_datadir}/cockpit/ovirt -type f >> ovirt.list
-%else
-rm -rf %{buildroot}/%{_datadir}/cockpit/ovirt
-touch ovirt.list
-%endif
-
 echo '%dir %{_datadir}/cockpit/selinux' > selinux.list
 find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
 
@@ -289,7 +206,7 @@ echo '%dir %{_datadir}/cockpit/playground' > tests.list
 find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list
 
 %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
-%if 0%{?fedora} || 0%{?rhel} < 8
+%if 0%{?fedora}
 echo '%dir %{_datadir}/cockpit/docker' > docker.list
 find %{buildroot}%{_datadir}/cockpit/docker -type f >> docker.list
 %else
@@ -301,21 +218,6 @@ rm -rf %{buildroot}/%{_datadir}/cockpit/docker
 touch docker.list
 %endif
 
-%if 0%{?build_kubernetes}
-%if %{defined wip}
-%else
-rm %{buildroot}/%{_datadir}/cockpit/kubernetes/override.json
-%endif
-echo '%dir %{_datadir}/cockpit/kubernetes' > kubernetes.list
-find %{buildroot}%{_datadir}/cockpit/kubernetes -type f >> kubernetes.list
-%else
-rm -rf %{buildroot}/%{_datadir}/cockpit/kubernetes
-rm -f %{buildroot}/%{_libexecdir}/cockpit-kube-auth
-rm -f %{buildroot}/%{_libexecdir}/cockpit-kube-launch
-rm %{buildroot}/%{_libexecdir}/cockpit-stub
-touch kubernetes.list
-%endif
-
 # 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
@@ -339,15 +241,13 @@ 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 docker kubernetes machines ovirt packagekit pcp playground storaged; do
+for pkg in apps dashboard docker machines packagekit pcp playground storaged; do
     rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
 done
 # files from -tests
 rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets %{buildroot}/%{_sysconfdir}/cockpit/cockpit.conf
 # files from -pcp
 rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/
-# files from -kubernetes
-rm -f %{buildroot}/%{_libexecdir}/cockpit-kube-auth %{buildroot}/%{_libexecdir}/cockpit-kube-launch %{buildroot}/%{_libexecdir}/cockpit-stub
 # files from -machines
 rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml
 # files from -storaged
@@ -369,24 +269,16 @@ rm -rf %{buildroot}/usr/src/debug
 cat kdump.list sosreport.list networkmanager.list selinux.list >> system.list
 rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
 rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml
-rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
-%endif
-
-%if 0%{?rhel}
 rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml
+rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
 %endif
 
 %if 0%{?build_basic}
 %find_lang cockpit
 %endif
 
-# dwz has trouble with the go binaries
-# https://fedoraproject.org/wiki/PackagingDrafts/Go
-%global _dwz_low_mem_die_limit 0
-%if 0%{?fedora} || 0%{?rhel} >= 8
 %global _debugsource_packages 1
 %global _debuginfo_subpackages 0
-%endif
 
 %define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} %{?_debugsource_packages:-S debugsourcefiles.list} "%{_builddir}/%{?buildsubdir}"
 
@@ -421,13 +313,11 @@ troubleshooting, interactive command-line sessions, and more.
 %package bridge
 Summary: Cockpit bridge server-side component
 Requires: glib-networking
-%if 0%{?rhel} != 7
 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
-%endif
 
 %description bridge
 The Cockpit bridge component installed server side and runs commands on the
@@ -463,37 +353,26 @@ Requires: libpwquality
 Requires: /usr/bin/date
 Provides: cockpit-realmd = %{version}-%{release}
 Provides: cockpit-shell = %{version}-%{release}
-Obsoletes: cockpit-shell < 127
 Provides: cockpit-systemd = %{version}-%{release}
 Provides: cockpit-tuned = %{version}-%{release}
 Provides: cockpit-users = %{version}-%{release}
 %if 0%{?rhel}
 Provides: cockpit-networkmanager = %{version}-%{release}
-Obsoletes: cockpit-networkmanager < 135
+Obsoletes: cockpit-networkmanager
 Requires: NetworkManager
 Provides: cockpit-kdump = %{version}-%{release}
 Requires: kexec-tools
-# Optional components (only when soft deps are supported)
-%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends: polkit
-%endif
-%if 0%{?rhel} >= 8
 Recommends: NetworkManager-team
 Recommends: setroubleshoot-server >= 3.3.3
-%endif
 Provides: cockpit-selinux = %{version}-%{release}
 Provides: cockpit-sosreport = %{version}-%{release}
 %endif
-%if %{defined build_subscriptions}
-Provides: cockpit-subscriptions = %{version}-%{release}
-Requires: subscription-manager >= 1.13
-%endif
 # NPM modules which are also available as packages
-Provides: bundled(js-jquery) = 3.3.1
+Provides: bundled(js-jquery) = 3.4.1
 Provides: bundled(js-moment) = 2.24.0
 Provides: bundled(nodejs-flot) = 0.8.3
-Provides: bundled(nodejs-promise) = 8.0.3
+Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
-Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.8.0
 Provides: bundled(xstatic-patternfly-common) = 3.58.0
 
 %description system
@@ -506,18 +385,9 @@ Summary: Cockpit Web Service
 Requires: glib-networking
 Requires: openssl
 Requires: glib2 >= 2.37.4
-# RHEL/CentOS 7 has firewalld 0.6.x, but does not ship cockpit service
-%if 0%{?rhel} != 7
-%if 0%{?firewalld_service}
-Conflicts: firewalld >= 0.6.0-1
-%else
 Conflicts: firewalld < 0.6.0-1
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends: sscg >= 2.3
 Recommends: system-logos
-%endif
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -540,9 +410,6 @@ The Cockpit Web Service listens on the network, and authenticates users.
 %{_unitdir}/cockpit.service
 %{_unitdir}/cockpit-motd.service
 %{_unitdir}/cockpit.socket
-%if 0%{?firewalld_service}
-%{_prefix}/%{__lib}/firewalld/services/cockpit.xml
-%endif
 %{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf
 %{_sbindir}/remotectl
 %{_libdir}/security/pam_ssh_add.so
@@ -607,10 +474,8 @@ Summary: Cockpit user interface for networking, using NetworkManager
 Requires: cockpit-bridge >= 122
 Requires: cockpit-shell >= 122
 Requires: NetworkManager
-# Optional components (only when soft deps are supported)
+# Optional components
-%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends: NetworkManager-team
-%endif
 BuildArch: noarch
 
 %description networkmanager
@@ -626,9 +491,7 @@ The Cockpit component for managing networking.  This package uses NetworkManager
 Summary: Cockpit SELinux package
 Requires: cockpit-bridge >= 122
 Requires: cockpit-shell >= 122
-%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires: setroubleshoot-server >= 3.3.3
-%endif
 BuildArch: noarch
 
 %description selinux
@@ -657,21 +520,12 @@ Dummy package from building optional packages only; never install or publish me.
 Summary: Cockpit user interface for storage, using udisks
 Requires: cockpit-shell >= 122
 Requires: udisks2 >= 2.6
-%if 0%{?rhel} == 7
-# Recommends: not supported in RHEL <= 7
-Requires: udisks2-lvm2 >= 2.6
-Requires: udisks2-iscsi >= 2.6
-Requires: device-mapper-multipath
-Requires: python
-Requires: python-dbus
-%else
 Recommends: udisks2-lvm2 >= 2.6
 Recommends: udisks2-iscsi >= 2.6
 Recommends: device-mapper-multipath
 Recommends: clevis-luks
 Requires: %{__python3}
 Requires: python3-dbus
-%endif
 BuildArch: noarch
 
 %description -n cockpit-storaged
@@ -686,7 +540,6 @@ Requires: cockpit-bridge >= 138
 Requires: cockpit-system >= 138
 Requires: openssh-clients
 Provides: cockpit-test-assets = %{version}-%{release}
-Obsoletes: cockpit-test-assets < 132
 
 %description -n cockpit-tests
 This package contains tests and files used while testing Cockpit.
@@ -701,19 +554,13 @@ BuildArch: noarch
 Summary: Cockpit user interface for virtual machines
 Requires: cockpit-bridge >= 122
 Requires: cockpit-system >= 122
-%if 0%{?rhel} == 7
+Requires: libvirt-daemon-kvm
-Requires: libvirt
-%else
-Requires: (libvirt-daemon-kvm or libvirt)
-%endif
 Requires: libvirt-client
-%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires: libvirt-dbus >= 1.2.0
 # Optional components
 Recommends: virt-install
 Recommends: libosinfo
 Recommends: python3-gobject-base
-%endif
 
 %description -n cockpit-machines
 The Cockpit components for managing virtual machines.
@@ -723,27 +570,6 @@ If "virt-install" is installed, you can also create new virtual machines.
 %files -n cockpit-machines -f machines.list
 %{_datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml
 
-%if 0%{?build_ovirt}
-
-%package -n cockpit-machines-ovirt
-BuildArch: noarch
-Summary: Cockpit user interface for oVirt virtual machines
-Requires: cockpit-bridge >= 122
-Requires: cockpit-system >= 122
-%if 0%{?rhel} == 7
-Requires: libvirt
-%else
-Requires: (libvirt-daemon-kvm or libvirt)
-%endif
-Requires: libvirt-client
-
-%description -n cockpit-machines-ovirt
-The Cockpit components for managing oVirt virtual machines.
-
-%files -n cockpit-machines-ovirt -f ovirt.list
-
-%endif
-
 %package -n cockpit-pcp
 Summary: Cockpit PCP integration
 Requires: cockpit-bridge >= 134.x
@@ -765,17 +591,9 @@ Cockpit support for reading PCP metrics and loading PCP archives.
 %if %{defined build_dashboard}
 %package -n cockpit-dashboard
 Summary: Cockpit remote servers and dashboard
-%if 0%{?rhel} == 7
-Provides: cockpit-ssh = %{version}-%{release}
-# nothing depends on the dashboard, but we can't use it with older versions of the bridge
-Conflicts: cockpit-bridge < 135
-# PR #10430 dropped workaround for ws' inability to understand x-host-key challenge
-Conflicts: cockpit-ws < 173.1
-%else
 BuildArch: noarch
 Requires: cockpit-ssh >= 135
 Conflicts: cockpit-ws < 135
-%endif
 
 %description -n cockpit-dashboard
 Cockpit support for connecting to remote servers (through ssh),
@@ -786,19 +604,14 @@ bastion hosts, and a basic dashboard.
 %endif
 
 %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
-
+%if 0%{?fedora}
-%if 0%{?fedora} || 0%{?rhel} < 8
 %package -n cockpit-docker
 Summary: Cockpit user interface for Docker containers
 Requires: cockpit-bridge >= 122
 Requires: cockpit-shell >= 122
 Requires: /usr/bin/docker
 Requires: /usr/lib/systemd/system/docker.service
-%if 0%{?fedora}
 Requires: %{__python3}
-%else
-Requires: python2
-%endif
 
 %description -n cockpit-docker
 The Cockpit components for interacting with Docker and user interface.
@@ -809,32 +622,6 @@ This package is not yet complete.
 %endif
 %endif
 
-%if 0%{?build_kubernetes}
-
-%package -n cockpit-kubernetes
-Summary: Cockpit user interface for Kubernetes cluster
-Requires: /usr/bin/kubectl
-# Requires: Needs newer localization support
-Requires: cockpit-bridge >= 137.x
-Requires: cockpit-shell >= 137.x
-BuildRequires: %{go_scl_prefix}golang-bin
-BuildRequires: %{go_scl_prefix}golang-src
-Provides: cockpit-stub = %{version}-%{release}
-
-%description -n cockpit-kubernetes
-The Cockpit components for visualizing and configuring a Kubernetes
-cluster. Installed on the Kubernetes master. This package is not yet complete.
-
-%if 0%{?rhel} >= 8
-%enable_gotoolset7
-%endif
-
-%files -n cockpit-kubernetes -f kubernetes.list
-%{_libexecdir}/cockpit-kube-auth
-%{_libexecdir}/cockpit-kube-launch
-%{_libexecdir}/cockpit-stub
-%endif
-
 %package -n cockpit-packagekit
 Summary: Cockpit user interface for packages
 BuildArch: noarch
@@ -851,6 +638,15 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Jul 10 2019 Martin Pitt <mpitt@redhat.com> - 198-1
+
+- PatternFly4 user interface design
+- SELinux: Show changes
+- Machines: Deletion of Virtual Networks
+- Machines: Support more disk types
+- Docker: Change menu label
+- Web server: More flexible https redirection for proxies
+
 * Wed May 15 2019 Sanne Raymaekers <sanne.raymaekers@gmail.com> - 194-1
 
 - Firewall: Add services to a specific zone

sources

@@ -1 +1 @@
-SHA512 (cockpit-194.tar.xz) = 3a20daf8610dd105960fcb5d4df04176ec0a4a8dc0cde919aadcdbe9c1bc85a3c83d1c8f87436d253824bd7b20442adda62e4ed3af1062ed5ab15d0092108b5d
+SHA512 (cockpit-198.tar.xz) = cb0eb14fecfbd730294b3d32e8aa6c8586c377ec9c20ad8d1a2df7a0c45cb0dc9b144a184736fb3bde9a92a69e351d1eb2eac9fd6b00c7c6674e9170f0279d08