From 8a4a428349a8023f23526d23c5ab68628fccb758 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Thu, 8 Jul 2021 11:07:29 +0200
Subject: [PATCH] Update to Fedora 248-1 release

Pull in an additional post-248 FMF test workaround for the broken
epel.repo in the RHEL 9 Testing Farm images.

[1] https://github.com/cockpit-project/cockpit/commit/d08581

Related: rhbz#1962078
---
 .gitignore         |  4 ++++
 cockpit.spec       | 29 ++++++++++++++++++++---------
 plans/upstream.fmf |  3 ++-
 sources            |  2 +-
 tests/.gitignore   |  3 ---
 5 files changed, 27 insertions(+), 14 deletions(-)
 delete mode 100644 tests/.gitignore

diff --git a/.gitignore b/.gitignore
index 145af2f..6a51495 100644
--- a/.gitignore
+++ b/.gitignore
@@ -203,7 +203,11 @@
 /cockpit-239.tar.xz
 /cockpit-240.tar.xz
 /cockpit-241.tar.xz
+/cockpit-242.tar.xz
+/cockpit-243.tar.xz
+/cockpit-244.tar.xz
 /cockpit-244.1.tar.xz
 /cockpit-245.tar.xz
 /cockpit-246.tar.xz
 /cockpit-247.tar.xz
+/cockpit-248.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index ad97617..e28fe34 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        247
+Version:        248
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -19,7 +19,7 @@ Release: 1%{?dist}
 #
 
 # This file is maintained at the following location:
-# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
+# https://github.com/cockpit-project/cockpit/blob/main/tools/cockpit.spec
 #
 # If you are editing this file in another location, changes will likely
 # be clobbered the next time an automated release is done.
@@ -471,7 +471,6 @@ authentication via sssd/FreeIPA.
 %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
 %dir %{_sysconfdir}/cockpit
 %config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d
@@ -546,6 +545,14 @@ fi
 # firewalld only partially picks up changes to its services files without this
 test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 
+# check for deprecated PAM config
+if grep --color=auto pam_cockpit_cert {_sysconfdir}/pam.d/cockpit; then
+    echo '**** WARNING:'
+    echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a'
+    echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.'
+    echo '**** WARNING:'
+fi
+
 %preun ws
 %systemd_preun cockpit.socket cockpit.service
 
@@ -680,7 +687,7 @@ These files are not required for running Cockpit.
 %package -n cockpit-pcp
 Summary: Cockpit PCP integration
 Requires: cockpit-bridge >= 238.1.1
-Requires(post): pcp
+Requires: pcp
 
 %description -n cockpit-pcp
 Cockpit support for reading PCP metrics and loading PCP archives.
@@ -712,12 +719,16 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
-* Tue Jun 23 2021 Katerina Koukiou <kkoukiou@redhat.com> - 247-1
-- Metrics: Enable Grafana client setup
+* Wed Jul 07 2021 Allison Karlitskaya <allison.karlitskaya@redhat.com> - 248-1
+- Metrics: Install missing packages
+- PAM: Deprecate `pam_cockpit_cert` module
+- Build system cleanups
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 246-2
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
+* Wed Jun 23 2021 Katerina Koukiou <kkoukiou@redhat.com> - 247-1
+
+- Metrics: Enable Grafana client setup
+- Machines: Share host files with the guest using virtio-fs
+- Machines: Show list of pass-through devices
 
 * Wed Jun 09 2021 Marius Vollmer <mvollmer@redhat.com> - 246-1
 
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index 8e24afa..14c3dab 100644
--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -2,6 +2,7 @@ discover:
   how: fmf
   repository: https://github.com/cockpit-project/cockpit
   # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
-  ref: "247"
+  # 248 plus https://github.com/cockpit-project/cockpit/pull/16067
+  ref: "d1354d46082aa8b2ca039fbc9cf3064218b3d0f5"
 execute:
   how: tmt
diff --git a/sources b/sources
index 14c98ec..aef3595 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-247.tar.xz) = 787c461e604628278e2f1c61e319d7bb83fa8a2c28ab363df09bed4b4d393050d4bf29513415ae3200b40357ca2f465f5e87d6b1cc77320059c343aff5bb69fe
+SHA512 (cockpit-248.tar.xz) = 3fcfeed47668171fdaded505477bae1f996a9bce5061624c321e6c511c37ad95ce9c1c8eafe9135a1925dfc61da5a030b8aeb5828778f4c8a342d4affdb40d9d
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index eae05e5..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.retry
-artifacts/
-source/