From cf7d2d0b86aaf9fed953e2e139db235bf45da8f1 Mon Sep 17 00:00:00 2001
From: Cockpit Project <cockpituous@gmail.com>
Date: Wed, 16 Oct 2019 16:33:15 +0000
Subject: [PATCH] Update to 205-1

- Firewall: UI restructuring
- Machines: Refactor Create VM dialog and introduce a download option
- Adjust menu to PatternFly's current navigation design
- Searching with keywords
- Software Updates: Use notifications for available updates info
- Web server security hardening
---
 .gitignore   |  1 +
 cockpit.spec | 26 ++++++++++++++++++++++----
 sources      |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index c82c5cd..f2324e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,3 +159,4 @@
 /cockpit-202.1.tar.xz
 /cockpit-203.tar.xz
 /cockpit-204.tar.xz
+/cockpit-205.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index a2b9e1c..8a5ee6f 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        204
+Version:        205
 Release: 1%{?dist}
 #
 # This file is maintained at the following location:
@@ -70,7 +70,7 @@ 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
 %endif
@@ -124,6 +124,7 @@ 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"' \
@@ -412,20 +413,28 @@ 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.socket
+%{_unitdir}/cockpit-wsinstance-https.service
 %{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf
 %{_sbindir}/remotectl
 %{_libdir}/security/pam_ssh_add.so
 %{_libexecdir}/cockpit-ws
 %{_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
@@ -667,6 +676,15 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Oct 16 2019 Simon Kobyda <skobyda@redhat.com> - 205-1
+
+- Firewall: UI restructuring
+- Machines: Refactor Create VM dialog and introduce a download option
+- Adjust menu to PatternFly's current navigation design
+- Searching with keywords
+- Software Updates: Use notifications for available updates info
+- Web server security hardening
+
 * Wed Oct 02 2019 Martin Pitt <mpitt@redhat.com> - 204-1
 
 - System: Highlight failed services
diff --git a/sources b/sources
index 774d0fd..4ca057d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-204.tar.xz) = 09c25955046531a64275b02a52ac60f664335f277806a8f762fce951fd7983ad9206f08957266e1555c438aa6a6fa565ceb1287eda2fb5008a0acc7b4349f615
+SHA512 (cockpit-205.tar.xz) = 42c5c71db9bde73a931fd1382aa6f0fe8887e763f3b33cbade25aae51b7d0e509297d32478fc562a4d548b36ba315e3e76267ca91a6f5d35471539ce05b4a1b2