summary refs log tree commit diff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2018-03-17 12:53:18 +0100
committervan Hauser <vh@thc.org>2018-03-17 12:53:18 +0100
commitb89395d496aee5db267f6dc180c7c7f5d75b8b52 (patch)
tree8f3fd2aa6c38adcd6dc8e5117a75811abfdba57a
parentbe37e1a71d60a2eeebab27713d459dd6e62ca9eb (diff)
downloadafl-dyninst-b89395d496aee5db267f6dc180c7c7f5d75b8b52.tar.gz
updated Dockerfile
-rw-r--r--Dockerfile13
1 files changed, 5 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile
index eb2e2ca..d28f75b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:trusty
-MAINTAINER rjohnson@moflow.org
+MAINTAINER rjohnson@moflow.org/vh@thc.org
 
 # dyninst ubuntu 14.04/x64
 RUN apt-get update && apt-get install -y \
@@ -20,9 +20,7 @@ RUN apt-get update && apt-get install -y \
         libboost-all-dev \
     && rm -rf /var/lib/apt/lists/*
 
-#RUN curl http://www.paradyn.org/release9.1.0/DyninstAPI-9.1.0.tgz | tar -zxvf - \
-#    && cd DyninstAPI-9.1.0/ \
-RUN git clone https://github.com/dyninst/dyninst.git \
+RUN git clone https://github.com/dyninst/dyninst \
         && cd dyninst && mkdir build && cd build \
         && cmake .. \
         && make \
@@ -30,17 +28,16 @@ RUN git clone https://github.com/dyninst/dyninst.git \
         && cd ../..
 
 RUN curl http://lcamtuf.coredump.cx/afl/releases/afl-latest.tgz | tar -zxvf - \
-        && cd afl-2* \
+        && cd afl-* \
         && make \
         && make install \
         && cd ..
 
-RUN git clone https://github.com/talos-vulndev/afl-dyninst.git \
+RUN git clone https://github.com/vanhauser-thc/afl-dyninst \
         && cd afl-dyninst \
         && ln -s `ls -d1 ../afl-2* | tail -1` afl \
         && make \
-        && cp afl-dyninst /usr/bin \
-        && cp libAflDyninst.so /usr/local/lib/ \
+        && make install \
         && cd .. \
         && echo "/usr/local/lib" > /etc/ld.so.conf.d/dyninst.conf && ldconfig \
         && echo "export DYNINSTAPI_RT_LIB=/usr/local/lib/libdyninstAPI_RT.so" >> .bashrc