From 636310f34342ec11e5a22d7f0082d87828166947 Mon Sep 17 00:00:00 2001
From: Nicholas Tsirakis <tsirakisn@ainfosec.com>
Date: Thu, 9 Mar 2023 16:05:56 -0500
Subject: [PATCH] [ghc8] Add new Debian 11 (Bullseye) Dockerfile

GHC8 requires a version of glibc that isn't available in
Debian 10. Add a new Dockerfile and update our master
symlink.

The only differences between this Dockerfile and the Buster
Dockerfile are the GHC version differences and the removal
of python-pysqlite2, which no longer exists in apt-get.

Signed-off-by: Nicholas Tsirakis <tsirakisn@ainfosec.com>
---
 Dockerfiles/openxt-bullseye-oe64 | 54 ++++++++++++++++++++++++++++++++
 Dockerfiles/openxt-master        |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfiles/openxt-bullseye-oe64

diff --git a/Dockerfiles/openxt-bullseye-oe64 b/Dockerfiles/openxt-bullseye-oe64
new file mode 100644
index 0000000..01e096d
--- /dev/null
+++ b/Dockerfiles/openxt-bullseye-oe64
@@ -0,0 +1,54 @@
+FROM multiarch/debian-debootstrap:amd64-bullseye
+MAINTAINER Daniel P. Smith <dpsmith@apertussolutions.com>
+
+ARG UNAME=build
+ARG UID=1000
+ARG GID=1000
+
+RUN sed -i "/bullseye-updates/d" /etc/apt/sources.list
+
+RUN apt-get update && apt-get install -yq \
+        openssh-server openssl \
+        sed wget cvs subversion git-core coreutils \
+        unzip texi2html texinfo docbook-utils gawk diffstat \
+        help2man make gcc build-essential g++ desktop-file-utils chrpath cpio \
+        screen bash-completion python3 iputils-ping \
+        guilt iasl quilt bin86 \
+        bcc libsdl1.2-dev liburi-perl genisoimage policycoreutils unzip vim \
+        rpm curl libncurses5-dev libncursesw5 libc6-dev-i386 libelf-dev \
+        xorriso mtools dosfstools libgmp-dev \
+        file byobu man ca-certificates locales && \
+        rm -rf /var/lib/apt-lists/* && \
+        echo "dash dash/sh boolean false" | debconf-set-selections && \
+        DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
+
+# Install the required version of GHC
+ARG GHC_VERSION=8.10.7
+RUN cd /tmp && \
+	wget https://downloads.haskell.org/~ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-x86_64-deb9-linux.tar.xz && \
+        tar Jxf ghc-${GHC_VERSION}-x86_64-deb9-linux.tar.xz && \
+        rm ghc-${GHC_VERSION}-x86_64-deb9-linux.tar.xz && \
+        cd ghc-${GHC_VERSION} && \
+        ./configure --prefix=/usr && \
+        make install && \
+        cd /tmp && rm -rf ghc-${GHC_VERSION}
+
+# Add "repo" tool (used by many Yocto-based projects)
+RUN curl http://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
+        chmod a+x /usr/local/bin/repo
+
+# Symlink for troublesome packages
+RUN ln -s /lib64/ld-linux-x86-64.so.2 /lib/
+
+RUN useradd -Ums /bin/bash -l -p '""' -u $UID $UNAME
+
+# Add quilt config files
+ADD root/home/build/.quiltrc /home/build/.quiltrc
+ADD root/home/build/oxt-patch.header /home/build/oxt-patch.header
+
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
+    locale-gen
+ENV LANG en_US.utf8
+USER $UNAME
+WORKDIR /home/$UNAME
+ENTRYPOINT ["/bin/bash"]
diff --git a/Dockerfiles/openxt-master b/Dockerfiles/openxt-master
index 26d28f0..3cfab2f 120000
--- a/Dockerfiles/openxt-master
+++ b/Dockerfiles/openxt-master
@@ -1 +1 @@
-openxt-buster-oe64
\ No newline at end of file
+openxt-bullseye-oe64
\ No newline at end of file