From d5acf18e700aafcdcd025bf4184e104897555881 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Tue, 8 Aug 2023 15:55:36 -0400
Subject: [PATCH 1/2] Install go-md2man in place of mandown

Ref: https://github.com/containers/netavark/pull/771

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 IMG_SFX                                   | 2 +-
 cache_images/fedora-netavark_packaging.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/IMG_SFX b/IMG_SFX
index 93a62601..96d114ae 100644
--- a/IMG_SFX
+++ b/IMG_SFX
@@ -1 +1 @@
-20230807t144831z-f38f37d13
+20230808t195847z-f38f37d13
diff --git a/cache_images/fedora-netavark_packaging.sh b/cache_images/fedora-netavark_packaging.sh
index 440696cc..92aabfdc 100644
--- a/cache_images/fedora-netavark_packaging.sh
+++ b/cache_images/fedora-netavark_packaging.sh
@@ -88,8 +88,9 @@ if [[ $(uname -m) == "aarch64" ]]; then
     $SUDO env PATH=$PATH CARGO_HOME=$CARGO_HOME rustup target add aarch64-unknown-linux-gnu
 fi
 
-msg "Install mandown to generate man pages"
-$SUDO env PATH=$PATH CARGO_HOME=$CARGO_HOME cargo install mandown
+msg "Install tool to generate man pages"
+$SUDO go install github.com/cpuguy83/go-md2man/v2@latest
+$SUDO install /root/go/bin/go-md2man /usr/local/bin/
 
 # Downstream users of this image are specifically testing netavark & aardvark-dns
 # code changes.  We want to start with using the RPMs because they deal with any

From d607d2a98485d55e3807b371cbfa31368c4e06fb Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 9 Aug 2023 10:37:18 -0400
Subject: [PATCH 2/2] Allow rawhide to use shared packaging script

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 IMG_SFX                       | 2 +-
 cache_images/rawhide_setup.sh | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IMG_SFX b/IMG_SFX
index 96d114ae..039b69c5 100644
--- a/IMG_SFX
+++ b/IMG_SFX
@@ -1 +1 @@
-20230808t195847z-f38f37d13
+20230809t143240z-f38f37d13
diff --git a/cache_images/rawhide_setup.sh b/cache_images/rawhide_setup.sh
index 5c4eab7f..ac128452 100644
--- a/cache_images/rawhide_setup.sh
+++ b/cache_images/rawhide_setup.sh
@@ -39,6 +39,9 @@ $SUDO sed -i -r -e 's/^gpgcheck=.+/gpgcheck=0/' /etc/yum.repos.d/*.repo
 $SUDO dnf5 -y distro-sync --releasever=rawhide --allowerasing
 $SUDO dnf5 upgrade -y
 
+# A shared fedora_packaging.sh script is called next that doesn't always support dnf5
+$SUDO ln -s $(type -P dnf5) /usr/local/bin/dnf
+
 # Packer will try to run 'cache_images/fedora_setup.sh' next, make sure the system
 # is actually running rawhide (and verify it boots).
 $SUDO reboot