bunch of fixes to get things to build

Author: StevenVanAcker

codereason/install

@@ -2,7 +2,9 @@
 
 git clone --depth 1 https://github.com/trailofbits/codereason
 cd codereason
+find . -type f -exec sed -i 's:/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain::g' {} \;
 ./install_vex.sh
+# This step fails in travis-ci because of CMake 3.2 not finding Boost, while docker has CMake 2.8 which finds Boost just fine
 ./make.sh
 cd ..
 

codereason/install-root-debian

@@ -1,4 +1,5 @@
 #!/bin/bash -ex
 set -eu -o pipefail
 
-apt-get -y install build-essential gcc g++ make cmake libboost-dev libprotobuf-dev protobuf-compiler libboost-thread-dev libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-date-time-dev libboost-regex-dev
+apt-get -y install build-essential gcc g++ make cmake libboost-dev libprotobuf-dev protobuf-compiler libboost-thread-dev libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-date-time-dev libboost-regex-dev libboost-all-dev
+

dislocker/install

@@ -1,14 +1,18 @@
 #!/bin/bash -ex
 
-wget http://www.hsc.fr/ressources/outils/dislocker/download/dislocker.tar.bz2
-tar xjf dislocker.tar.bz2
-cd dislocker/src
-sed 's?override LDFLAGS.*?& -Wl,-rpath,'`pwd`'?' < Makefile > Makefile.tmp && mv Makefile.tmp Makefile
+wget -O dislocker.tar.gz https://github.com/Aorimn/dislocker/archive/v0.7.1.tar.gz
+tar xf dislocker.tar.gz
+DISLOCKERDIR=$(ls -d dislocker-*)
+cd $DISLOCKERDIR
+
+cmake .
 make -j $(nproc)
-cd ../..
+cd ..
 mkdir bin
 cd bin
-ln -s ../dislocker/src/dislocker-bek .
-ln -s ../dislocker/src/dislocker-file .
-ln -s ../dislocker/src/dislocker-fuse .
-ln -s ../dislocker/src/dislocker-metadata .
+ls -l ../$DISLOCKERDIR/src/
+
+ln -s ../$DISLOCKERDIR/src/dislocker-bek .
+ln -s ../$DISLOCKERDIR/src/dislocker-file .
+ln -s ../$DISLOCKERDIR/src/dislocker-fuse .
+ln -s ../$DISLOCKERDIR/src/dislocker-metadata .

sqlmap/install

@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git
-ctf-tools-pip install pymysql psycopg2 pysqlite2 python-ntlm
+ctf-tools-pip install pymysql psycopg2 pysqlite python-ntlm
 mkdir bin
 cd bin
 ln -s ../sqlmap/sqlmap.py .

sqlmap/install-root-debian

@@ -1,4 +1,4 @@
 #!/bin/bash -ex
 set -eu -o pipefail
 
-apt-get -y install libsqlite3-dev
+apt-get -y install libsqlite3-dev libpq-dev

stegdetect/install

@@ -2,13 +2,10 @@
 
 INST_DIR="$PWD"
 
-#wget -O - http://www.outguess.org/stegdetect-0.6.tar.gz | tar xz
-#cd stegdetect-0.6
-git clone --depth 1 https://github.com/abeluck/stegdetect stegdetect-0.6
-wget -O - http://archive.debian.org/debian-archive/debian/pool/main/s/stegdetect/stegdetect_0.6-3.tar.gz | tar xz stegdetect-0.6/file/Magdir/varied.out
+git clone --depth 1 https://github.com/AlexandreFournier/stegdetect.git
 
 mkdir -p bin etc man/man1 share/stegbreak
-cd stegdetect-0.6
+cd stegdetect
 linux32 ./configure --prefix="$INST_DIR"
 linux32 make
 linux32 make install

stegdetect/install-root-debian

@@ -1,4 +1,4 @@
 #!/bin/bash -ex
 set -eu -o pipefail
 
-apt-get -y install automake1.4
+apt-get -y install automake1.4 automake autotools-dev libevent-dev

xrop/install

@@ -3,10 +3,10 @@
 git clone --depth 1 https://github.com/acama/xrop.git
 cd xrop
 git submodule update --init --recursive
-make -j $(nproc)
+make -j 1 # Watch out!! -j $(nproc) makes the build fail
 cd ..
 
 mkdir bin
 cd bin
-ln -s ../xrop/xrop .
+ln -s ../xrop 
 cd ..