From 5b2e766364732a958d5d80ba61b139206dc00bdb Mon Sep 17 00:00:00 2001
From: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date: Sun, 19 May 2024 18:28:43 +0200
Subject: [PATCH 1/3] Add libssl1.1 for samp and openmp

---
 games/samp/Dockerfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile
index a00655712..cb54f3ca7 100644
--- a/games/samp/Dockerfile
+++ b/games/samp/Dockerfile
@@ -7,14 +7,20 @@ RUN         apt update \
 RUN         dpkg --add-architecture i386 \
             && apt update \
             && apt upgrade -y \
-            && apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip tini \
+            && apt install -y libstdc++6 lib32stdc++6 tar wget curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip tini \
             && apt install -y libtbb12:i386 libtbb-dev:i386 libicu-dev:i386  \
             && useradd -d /home/container -m container
 
 RUN         mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
 RUN         rm -rf /var/lib/apt/lists/*
 
-
+            # Temp fix for things that still need libssl1.1
+RUN         if [ "$(uname -m)" = "x86_64" ]; then \
+                wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
+                dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
+                rm libssl1.1_1.1.0g-2ubuntu4_amd64.deb; \
+            fi
+			
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

From 0e0c76820a6c4922a522b2f1a2e814c58a7cd0a0 Mon Sep 17 00:00:00 2001
From: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date: Sun, 19 May 2024 19:12:55 +0200
Subject: [PATCH 2/3] 32 bit one?

---
 games/samp/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile
index cb54f3ca7..c582df503 100644
--- a/games/samp/Dockerfile
+++ b/games/samp/Dockerfile
@@ -14,10 +14,10 @@ RUN         dpkg --add-architecture i386 \
 RUN         mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
 RUN         rm -rf /var/lib/apt/lists/*
 
-            # Temp fix for things that still need libssl1.1
+            # Temp fix for things that still need libssl1.1 32 bit
 RUN         if [ "$(uname -m)" = "x86_64" ]; then \
-                wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
-                dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
+                wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_i386.deb && \
+                dpkg -i libssl1.1_1.1.0g-2ubuntu4_i386.deb && \
                 rm libssl1.1_1.1.0g-2ubuntu4_amd64.deb; \
             fi
 			

From c531bfee27144001afd41d1cbfb502c2205d7a7c Mon Sep 17 00:00:00 2001
From: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date: Sun, 19 May 2024 19:33:05 +0200
Subject: [PATCH 3/3] Remove the right file

---
 games/samp/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile
index c582df503..ba6198a11 100644
--- a/games/samp/Dockerfile
+++ b/games/samp/Dockerfile
@@ -18,7 +18,7 @@ RUN         rm -rf /var/lib/apt/lists/*
 RUN         if [ "$(uname -m)" = "x86_64" ]; then \
                 wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_i386.deb && \
                 dpkg -i libssl1.1_1.1.0g-2ubuntu4_i386.deb && \
-                rm libssl1.1_1.1.0g-2ubuntu4_amd64.deb; \
+                rm libssl1.1_1.1.0g-2ubuntu4_i386.deb; \
             fi
 			
 USER        container