From b4516298b744287d983622cc77a735d632132879 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 18 Mar 2024 12:32:09 -0600
Subject: [PATCH] New VM build, just to see how things are

New pasta (03-19). And whatever else comes in.

Also: install StrawberryPerl on Windows, see:

  https://github.com/containers/podman/pull/21991

First CI-detected problem:

    debian: The following packages have unmet dependencies:
    debian:  libfuse2t64 : Breaks: libfuse2 (< 2.9.9-8.1)

Solution attempted: remove libfuse2 from INSTALL_PACKAGES

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 IMG_SFX                          |  2 +-
 cache_images/debian_packaging.sh |  1 -
 cache_images/fedora_packaging.sh | 20 ++++++++------------
 win_images/win_packaging.ps1     |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/IMG_SFX b/IMG_SFX
index 2b9d16d4..62386ca8 100644
--- a/IMG_SFX
+++ b/IMG_SFX
@@ -1 +1 @@
-20240308t191852z-f39f38d13
+20240319t134325z-f39f38d13
diff --git a/cache_images/debian_packaging.sh b/cache_images/debian_packaging.sh
index 292cb52d..c1912b9a 100644
--- a/cache_images/debian_packaging.sh
+++ b/cache_images/debian_packaging.sh
@@ -59,7 +59,6 @@ INSTALL_PACKAGES=(\
     libdevmapper-dev
     libdevmapper1.02.1
     libfuse-dev
-    libfuse2
     libfuse3-dev
     libglib2.0-dev
     libgpgme11-dev
diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh
index ad1d88f9..0261b669 100644
--- a/cache_images/fedora_packaging.sh
+++ b/cache_images/fedora_packaging.sh
@@ -193,20 +193,16 @@ DOWNLOAD_PACKAGES=(\
 msg "Installing general build/test dependencies"
 bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"
 
-# 2024-02-20 package needed for podman #21563
-# 2024-02-26 stable everywhere except fc38
-timebomb 20240310 "package not yet in stable for fc38"
-if [[ "$OS_RELEASE_VER" -eq 38 ]]; then
+# 2024-03-18 new pasta, built today, not yet stable anywhere
+timebomb 20240320 "package not yet in stable for fc38"
+if [[ "$OS_RELEASE_VER" -le 41 ]]; then
     arch=$(uname -m)
+    n=passt
+    v=0%5E20240319.gd35bcbe
+    r=1.fc$OS_RELEASE_VER
     bigto $SUDO dnf install -y  \
-          https://kojipkgs.fedoraproject.org/packages/passt/0%5E20240220.g1e6f92b/1.fc$OS_RELEASE_VER/$arch/passt-0%5E20240220.g1e6f92b-1.fc$OS_RELEASE_VER.$arch.rpm \
-          https://kojipkgs.fedoraproject.org/packages/passt/0%5E20240220.g1e6f92b/1.fc$OS_RELEASE_VER/noarch/passt-selinux-0%5E20240220.g1e6f92b-1.fc$OS_RELEASE_VER.noarch.rpm
-fi
-
-timebomb 20240310 "ARGH! Stupid rc6 kernel still not stable, force it"
-if [[ "$OS_RELEASE_VER" -eq 41 ]]; then
-    bigto $SUDO dnf install -y \
-          https://kojipkgs.fedoraproject.org//packages/kernel/6.8.0/0.rc6.49.fc41/x86_64/kernel{,-core,-modules,-modules-core}-6.8.0-0.rc6.49.fc41.x86_64.rpm
+          https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/$arch/$n-$v-$r.$arch.rpm \
+          https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/noarch/$n-selinux-$v-$r.noarch.rpm
 fi
 
 msg "Downloading packages for optional installation at runtime, as needed."
diff --git a/win_images/win_packaging.ps1 b/win_images/win_packaging.ps1
index e85ce04e..16a0ee66 100644
--- a/win_images/win_packaging.ps1
+++ b/win_images/win_packaging.ps1
@@ -9,7 +9,7 @@ iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocola
 
 # Install basic required tooling.
 #   psexec needed to workaround session 0 WSL bug
-retryInstall git archiver psexec golang mingw; Check-Exit
+retryInstall git archiver psexec golang mingw StrawberryPerl; Check-Exit
 
 # Update service is required for dotnet
 Set-Service -Name wuauserv -StartupType "Manual"; Check-Exit