From 4edefa6b19f44515f92eb0946eebf48849f1e9d3 Mon Sep 17 00:00:00 2001
From: Katerina Koukiou <kkoukiou@redhat.com>
Date: Thu, 11 Nov 2021 18:33:07 +0100
Subject: [PATCH] Update to Fedora 257-1 release

Related: rhbz#1984951
---
 .gitignore         |  1 +
 cockpit.spec       | 18 +++++++++++++++---
 plans/upstream.fmf |  2 +-
 sources            |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e26587..007a84b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -218,3 +218,4 @@
 /cockpit-253.tar.xz
 /cockpit-254.tar.xz
 /cockpit-255.tar.xz
+/cockpit-257.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 1a8c350..742680e 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        255
+Version:        257
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -81,8 +81,8 @@ Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{v
 %define build_optional 1
 %endif
 
-# Ship custom SELinux policy only in Fedora and RHEL-9 onward
-%if 0%{?rhel} >= 9 || 0%{?fedora}
+# Ship custom SELinux policy (but not for cockpit-appstream)
+%if "%{name}" == "cockpit"
 %define selinuxtype targeted
 %define with_selinux 1
 %define selinux_policy_version %(rpm --quiet -q selinux-policy && rpm -q --queryformat "%{V}-%{R}" selinux-policy || echo 1)
@@ -714,6 +714,18 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Nov 10 2021 Katerina Koukiou <kkoukiou@redhat.com> - 257-1
+- Support for reading TLS certificates with any permissions
+- cockpit-ws no longer supports merged certificates
+- Services: Show user-owned systemd units
+
+* Wed Oct 27 2021 Jelle van der Waa <jvanderwaa@redhat.com> - 256-1
+- Clean up old self-signed certificates
+- Storage: Add support for Stratis
+
+* Fri Oct 15 2021 Martin Pitt <mpitt@redhat.com> - 255.1-1
+- Fix realmd join dialog crash if given address is not the domain name
+
 * Wed Oct 13 2021 Martin Pitt <mpitt@redhat.com> - 255-1
 - FreeIPA-issued webserver certificates get auto-renewed
 
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index e831993..bbfc602 100644
--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -2,6 +2,6 @@ discover:
   how: fmf
   repository: https://github.com/cockpit-project/cockpit
   # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
-  ref: "255"
+  ref: "257"
 execute:
   how: tmt
diff --git a/sources b/sources
index cd477ef..2aa921e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-255.tar.xz) = a9863bc4b79a56a54e66fdf4d50cb9dbe37531dfaaffad4f2b1f9858e84ddc2fe618df1a2156ad87d34264428b38faee697009888bc6364f6d0249f14b20382f
+SHA512 (cockpit-257.tar.xz) = 9484e19207e11b9c069d727f445f41969f6bc7abcfa111a90a18693533f43339374c4954a043f345ac09da6f00db061101dfe256bb84b8c8610cc5be6814140f