From 42ca52ced1c131c9103077a61ff2580b76b1910f Mon Sep 17 00:00:00 2001
From: Cockpit Project <cockpituous@gmail.com>
Date: Wed, 7 Jul 2021 12:58:58 +0000
Subject: [PATCH] Update to 248-1

- Metrics: Install missing packages
- PAM: Deprecate `pam_cockpit_cert` module
- Build system cleanups
---
 .gitignore         |  1 +
 cockpit.spec       | 20 ++++++++++++++++----
 plans/upstream.fmf |  2 +-
 sources            |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index f42d5ed..6a51495 100644
--- a/.gitignore
+++ b/.gitignore
@@ -210,3 +210,4 @@
 /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 2d74ad6..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,6 +719,11 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* 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
+
 * Wed Jun 23 2021 Katerina Koukiou <kkoukiou@redhat.com> - 247-1
 
 - Metrics: Enable Grafana client setup
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index 8e24afa..14aa6d9 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: "247"
+  ref: "248"
 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