From 14a4e632dc12c79fabe63af5dd9ec3ded4e2d699 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Wed, 9 Nov 2022 12:08:17 +0100
Subject: [PATCH] Update to upstream release 279

Resolves: rhbz#2139644
---
 .gitignore         |  2 ++
 cockpit.spec       | 13 +++++++++----
 plans/all.fmf      | 20 ++++++++++++++++++++
 plans/upstream.fmf |  5 -----
 sources            |  2 +-
 5 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 plans/all.fmf
 delete mode 100644 plans/upstream.fmf

diff --git a/.gitignore b/.gitignore
index 9cadc09..8910e36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -243,4 +243,6 @@
 /cockpit-275.tar.xz
 /cockpit-276.tar.xz
 /cockpit-276.1.tar.xz
+/cockpit-277.tar.xz
 /cockpit-278.tar.xz
+/cockpit-279.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 6a2ffe6..6629848 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -49,7 +49,7 @@ Summary:        Web Console for Linux servers
 License:        LGPLv2+
 URL:            https://cockpit-project.org/
 
-Version:        278
+Version:        279
 Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 
@@ -256,7 +256,8 @@ done
 for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
     rm %{buildroot}/%{_libexecdir}/$libexec
 done
-rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
+rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
+rm -f %{buildroot}/%{_libdir}/security/pam_*
 rm %{buildroot}/usr/bin/cockpit-bridge
 rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
 rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
@@ -268,7 +269,7 @@ for pkg in apps packagekit pcp playground storaged; do
     rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
 done
 # files from -tests
-rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets
+rm -f %{buildroot}/%{pamdir}/mock-pam-conv-mod.so
 # files from -pcp
 rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/
 # files from -storaged
@@ -622,7 +623,7 @@ This package contains tests and files used while testing Cockpit.
 These files are not required for running Cockpit.
 
 %files -n cockpit-tests -f tests.list
-%{_prefix}/%{__lib}/cockpit-test-assets
+%{pamdir}/mock-pam-conv-mod.so
 
 %package -n cockpit-pcp
 Summary: Cockpit PCP integration
@@ -659,6 +660,10 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Mon Nov 07 2022 Packit <hello@packit.dev> - 279-1
+- Dark theme support
+
+
 * Wed Oct 19 2022 Packit <hello@packit.dev> - 278-1
 - Metrics: Display individual disk read/write usage
 
diff --git a/plans/all.fmf b/plans/all.fmf
new file mode 100644
index 0000000..4da9513
--- /dev/null
+++ b/plans/all.fmf
@@ -0,0 +1,20 @@
+discover:
+    how: fmf
+    dist-git-source: true
+execute:
+    how: tmt
+
+/basic:
+    summary: Run tests for basic packages
+    discover+:
+        test: /test/browser/basic
+
+/network:
+    summary: Run tests for cockpit-networkmanager
+    discover+:
+        test: /test/browser/network
+
+/optional:
+    summary: Run tests for optional packages
+    discover+:
+        test: /test/browser/optional
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
deleted file mode 100644
index 0fd05c1..0000000
--- a/plans/upstream.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-discover:
-  how: fmf
-  dist-git-source: true
-execute:
-  how: tmt
diff --git a/sources b/sources
index ab394db..9c5bc10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-278.tar.xz) = 05a15b4bd95cb4a343ecc99a5cdead3f8da5b15dbb4d39a67e05a0be55aa4b891741e804efca9c1f1e4816e803e2cb7d754c9ac40fef25aef057a95505c4e7da
+SHA512 (cockpit-279.tar.xz) = 76788142d836ec6fadebe122da4b5fc6a5c41c99b5b66c84573488e7581edb313a947d6c6b20d6f858075c6c716f3c5f7b6874e2405844231c6c5ac60043d270