From 2736e8e5270a1c52a304740b9d25773792faafe2 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <timwoj@gmail.com>
Date: Mon, 5 Feb 2024 13:32:19 -0700
Subject: [PATCH 1/3] CI: Fix building of alpine image with regards to python
 packages

---
 ci/alpine/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/alpine/Dockerfile b/ci/alpine/Dockerfile
index 76aa75eeab..0c6c2153ca 100644
--- a/ci/alpine/Dockerfile
+++ b/ci/alpine/Dockerfile
@@ -23,9 +23,10 @@ RUN apk add --no-cache \
   openssl-dev \
   procps \
   py3-pip \
+  py3-websockets \
   python3 \
   python3-dev \
   swig \
   zlib-dev
 
-RUN pip3 install websockets junit2html
+RUN pip3 install --break-system-packages junit2html

From 60da27080058610f5ddccdabe21a8f485eeec73c Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <timwoj@gmail.com>
Date: Mon, 5 Feb 2024 13:33:52 -0700
Subject: [PATCH 2/3] CI: Remove emacs backup file of fedora-38 Dockerfile

---
 ci/fedora-38/Dockerfile~ | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 ci/fedora-38/Dockerfile~

diff --git a/ci/fedora-38/Dockerfile~ b/ci/fedora-38/Dockerfile~
deleted file mode 100644
index 3c002930ca..0000000000
--- a/ci/fedora-38/Dockerfile~
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM fedora:36
-
-# A version field to invalidate Cirrus's build cache when needed, as suggested in
-# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20220614
-
-RUN dnf -y install \
-    bison \
-    ccache \
-    cmake \
-    diffutils \
-    findutils \
-    flex \
-    gcc \
-    gcc-c++ \
-    git \
-    libpcap-devel \
-    make \
-    openssl \
-    openssl-devel \
-    procps-ng \
-    python3 \
-    python3-devel \
-    python3-pip\
-    sqlite \
-    swig \
-    which \
-    zlib-devel \
-  && dnf clean all && rm -rf /var/cache/dnf
-
-RUN pip3 install websockets junit2html

From 01d11d6c0bf5845e5bc6bedf037166bd9d498cc8 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <timwoj@gmail.com>
Date: Mon, 5 Feb 2024 14:01:42 -0700
Subject: [PATCH 3/3] Add missing include for int32_t in DebugCmds.h

---
 src/DebugCmds.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/DebugCmds.h b/src/DebugCmds.h
index 2e8d14c5ae..5913b21144 100644
--- a/src/DebugCmds.h
+++ b/src/DebugCmds.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <cstdlib>
 #include <deque>
 #include <string>