Update to cockpit 309 and cockpit-machines 305 upstream releases

Resolves: jira#RHEL-19598

cockpit-appstream.spec

@@ -28,7 +28,7 @@
 # we maintain the basic/optional split, then it can be replaced with just %{version}.
 %define required_base 266
 
-%define machines_version 304
+%define machines_version 305
 
 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
 %if 0%{?centos}
@@ -51,7 +51,7 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        307
+Version:        309
 Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 Source1:        https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_version}.tar.xz
@@ -449,7 +449,6 @@ Provides: cockpit-sosreport = %{version}-%{release}
 Recommends: (reportd if abrt)
 %endif
 
-Provides: bundled(npm(@babel/runtime)) = 7.23.6
 Provides: bundled(npm(@patternfly/patternfly)) = 5.1.0
 Provides: bundled(npm(@patternfly/react-core)) = 5.1.2
 Provides: bundled(npm(@patternfly/react-icons)) = 5.1.2
@@ -462,7 +461,7 @@ Provides: bundled(npm(attr-accept)) = 2.2.2
 Provides: bundled(npm(autolinker)) = 3.16.2
 Provides: bundled(npm(available-typed-arrays)) = 1.0.5
 Provides: bundled(npm(call-bind)) = 1.0.5
-Provides: bundled(npm(date-fns)) = 2.30.0
+Provides: bundled(npm(date-fns)) = 3.2.0
 Provides: bundled(npm(deep-equal)) = 2.2.3
 Provides: bundled(npm(define-data-property)) = 1.1.1
 Provides: bundled(npm(define-properties)) = 1.2.1
@@ -514,7 +513,6 @@ Provides: bundled(npm(react-dom)) = 18.2.0
 Provides: bundled(npm(react-dropzone)) = 14.2.3
 Provides: bundled(npm(react-is)) = 16.13.1
 Provides: bundled(npm(react)) = 18.2.0
-Provides: bundled(npm(regenerator-runtime)) = 0.14.0
 Provides: bundled(npm(regexp.prototype.flags)) = 1.5.1
 Provides: bundled(npm(remarkable)) = 2.0.1
 Provides: bundled(npm(scheduler)) = 0.23.0
@@ -549,7 +547,7 @@ Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
 Conflicts: firewalld < 0.6.0-1
 Recommends: sscg >= 2.3
 Recommends: system-logos
-Suggests: sssd-dbus
+Suggests: sssd-dbus >= 2.6.2
 # for cockpit-desktop
 Suggests: python3
 
@@ -748,6 +746,9 @@ Requires: cockpit-shell >= %{required_base}
 Requires: udisks2 >= 2.9
 Recommends: udisks2-lvm2 >= 2.9
 Recommends: udisks2-iscsi >= 2.9
+%if ! 0%{?rhel}
+Recommends: udisks2-btrfs >= 2.9
+%endif
 Recommends: device-mapper-multipath
 Recommends: clevis-luks
 Requires: %{__python3}
@@ -847,6 +848,9 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Jan 18 2024 Martin Pitt <mpitt@redhat.com> - 309-1
+- Machines: Fix deletion of SSH keys (jira#RHEL-19598)
+
 * Fri Dec 15 2023 Martin Pitt <mpitt@redhat.com> - 307-1
 - Storage redesign
 - Machines: Stop configuring SPICE by default for new VMs (jira#RHEL-18058)

plans/all.fmf

@@ -2,7 +2,7 @@ discover:
     how: fmf
     # for machines tests; keep in sync with cockpit-appstream.spec
     url: https://github.com/cockpit-project/cockpit-machines
-    ref: "304"
+    ref: "305"
 
 execute:
     how: tmt
@@ -11,7 +11,7 @@ execute:
     summary: Run Cockpit tests for optional packages
     discover+:
         url: https://github.com/cockpit-project/cockpit
-        ref: "307"
+        ref: "308"
         test: /test/browser/optional
 
 /machines-basic:

sources

@@ -1,2 +1,2 @@
-SHA512 (cockpit-307.tar.xz) = aad6b680755b258996a99db434b528a22ab4e9f0f2db629f44513e6d63f4ecd67efe644bc8fc0b3c2acc631093c4cf5de6de733a96e403253bf666e2c8210c9a
-SHA512 (cockpit-machines-304.tar.xz) = 7e6c88e1ef19af9d24db59a29fec23382c3e5e195a004936d5e597f32d93320cfcdf9853c0f77d057cd8df8a24f41992a3e696fc958926e36b31b6acb695e250
+SHA512 (cockpit-309.tar.xz) = 17e935515e7de32a09a6255273553394c4c47b551ae6c6e2545e143dc636d79fe5d58f903fdb8c92117eb45a60f64ef1d5bd086950a175f71cb11fa754b76c83
+SHA512 (cockpit-machines-305.tar.xz) = c757656495ee86671c6fa68d374eab2d5db55e54ab9c54e4dea601ce0161b799f5bfae32c2def3cf0ad10de87dc0095bd07f4a0b5b8e53221abaabfa01aa6b23