From 44818cf9ff63e7f5c997f76c309d0d9cb35a3c68 Mon Sep 17 00:00:00 2001
From: Chris Humphries <chris@sogonsecurity.com>
Date: Sat, 3 Jun 2023 06:48:46 -0400
Subject: [PATCH] Update to current Ubuntu 23.04 and ensure things still work.

---
 Dockerfile | 11 +++++------
 build.sh   |  2 +-
 run.sh     |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ac10154..71e1ec6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,21 +7,20 @@
 # Run the docker container -> run.sh
 # Get a shell in the container -> shell.sh
 
-FROM ubuntu:21.04
+FROM ubuntu:23.04
 ENV LC_CTYPE C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive
 COPY dot_rizinrc /root/.rizinrc
-#COPY dot_bashrc /root/.bashrc
 RUN apt-get update && \
-apt-get install -y build-essential jq strace ltrace curl wget rubygems gcc dnsutils netcat gcc-multilib net-tools \
-  vim gdb gdb-multiarch python python3 python3-pip python3-dev libssl-dev libffi-dev wget git make procps \
+apt-get install -y build-essential jq strace ltrace curl wget rubygems gcc dnsutils netcat-traditional gcc-multilib net-tools \
+  vim gdb gdb-multiarch python3-full python3-pip python3-dev libssl-dev libffi-dev wget git make procps \
   libpcre3-dev libdb-dev libxt-dev libxaw7-dev emacs-nox tmux && \
-pip install capstone requests pwntools r2pipe keystone-engine unicorn ropper meson ninja && \
+pip3 install --break-system-packages capstone requests pwntools r2pipe keystone-engine unicorn ropper meson ninja && \
 mkdir /tools && \
 cd /tools && git clone https://github.com/JonathanSalwan/ROPgadget && \
 cd /tools && git clone https://github.com/niklasb/libc-database && \
 cd /tools && git clone https://github.com/hugsy/gef && \
-wget -O /root/.gdbinit-gef.py -q https://github.com/hugsy/gef/raw/master/gef.py && \
+wget -O /root/.gdbinit-gef.py -q https://raw.githubusercontent.com/hugsy/gef/main/gef.py && \
 echo source /root/.gdbinit-gef.py >> /root/.gdbinit && \ 
 cd /tools && git clone --recurse-submodules https://github.com/rizinorg/rizin && \
 cd rizin && meson build && ninja -C build && ninja -C build install
diff --git a/build.sh b/build.sh
index a5a58b9..4250e05 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker build -t docker-binaryexploitation:ubuntu20.10 .
+docker build -t docker-binaryexploitation:ubuntu23.04 .
diff --git a/run.sh b/run.sh
index 5d3119d..d8b6439 100755
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker run --rm -v "$(pwd)/host:/host" -v "$(pwd)/logs:/logs" --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -d --name docker-binaryexploitation -i docker-binaryexploitation:ubuntu20.10
+docker run --rm -v "$(pwd)/host:/host" -v "$(pwd)/logs:/logs" --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -d --name docker-binaryexploitation -i docker-binaryexploitation:ubuntu23.04