From a4bafb6e11b613a20d89a7f1da4806476a50eb8a Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Tue, 16 Feb 2021 18:00:04 +0100
Subject: dockerfile enhancements

---
 Dockerfile      | 22 +++++++++++-----------
 afl-dyninst.cpp |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a632b31..998ffc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,10 +9,13 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install \
         make \
         cmake \
         git \
+        gdb \
         ca-certificates \
         tar \
         gzip \
         vim \
+        joe \
+        wget \
         curl \
         apt-utils \
         libelf-dev \
@@ -24,27 +27,24 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install \
         libtbb-dev \
     && apt-get -y autoremove && rm -rf /var/lib/apt/lists/*
 
-RUN git clone https://github.com/dyninst/dyninst \
+RUN git clone --depth=1 https://github.com/dyninst/dyninst \
         && cd dyninst && mkdir build && cd build \
         && cmake .. \
-        && make \
+        && make -j3 \
         && make install
 
-RUN git clone https://github.com/vanhauser-thc/AFLplusplus \
+RUN git clone --depth=1 https://github.com/AFLplusplus/AFLplusplus \
         && cd AFLplusplus \
         && make source-only \
-        && make install \
-        && cd ..
-
-RUN mkdir -p /path/to/dyninst/ && ln -s /dyninst/build /path/to/dyninst/build-directory
+        && make install
 
-RUN git clone https://github.com/vanhauser-thc/afl-dyninst \
+RUN git clone --depth=1 https://github.com/vanhauser-thc/afl-dyninst \
         && cd afl-dyninst \
         && ln -s ../AFLplusplus afl \
         && make \
-        && make install \
-        && cd .. \
-        && echo "/usr/local/lib" > /etc/ld.so.conf.d/dyninst.conf && ldconfig \
+        && make install
+
+RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/dyninst.conf && ldconfig \
         && echo "export DYNINSTAPI_RT_LIB=/usr/local/lib/libdyninstAPI_RT.so" >> .bashrc
 
 RUN rm -rf afl-dyninst AFLplusplus dyninst
diff --git a/afl-dyninst.cpp b/afl-dyninst.cpp
index ea6a4f4..450d903 100644
--- a/afl-dyninst.cpp
+++ b/afl-dyninst.cpp
@@ -346,7 +346,7 @@ int main(int argc, char **argv) {
   char *func2patch = NULL;
   int loop;
 
-  cout << "afl-dyninst (c) 2017-2020 by Aleksandar Nikolic and Marc Heuse [https://github.com/vanhauser-thc/afl-dyninst] Apache 2.0 License" << endl;
+  cout << "afl-dyninst (c) 2017-2021 by Aleksandar Nikolic and Marc Heuse [https://github.com/vanhauser-thc/afl-dyninst] Apache 2.0 License" << endl;
 
   if (argc < 3 || strncmp(argv[1], "-h", 2) == 0 || strncmp(argv[1], "--h", 3) == 0) {
     cout << "Usage: " << argv[0] << USAGE;
-- 
cgit 1.4.1