bap days are over

bap_install.sh

@@ -1,5 +1,13 @@
 #!/bin/bash -e
 
+echo "fetching BAP deps"
+sudo apt-get install -qq -y software-properties-common libgmp-dev llvm-3.4-dev time clang-3.4
+
+echo "installing ocaml and opam"
+echo 'yes' | sudo add-apt-repository ppa:avsm/ocaml42+opam12
+sudo apt-get update -qq
+sudo apt-get install -qq -y ocaml ocaml-native-compilers camlp4-extra opam
+
 echo "preparing opam"
 export OPAMYES=1
 export OPAMJOBS=$(grep processor < /proc/cpuinfo | wc -l)

fetchlibs.sh

@@ -49,6 +49,7 @@ fetcharch armhf precise
 fetcharch armel precise
 fetcharch powerpc precise
 fetcharch arm64 saucy
+fetcharch i386 precise
 
 # mini debootstrap 
 

install.sh

@@ -12,16 +12,12 @@ if [[ "$unamestr" == 'Linux' ]]; then
     sudo apt-get update -qq
     sudo apt-get -qq -y install build-essential python-dev python-pip debootstrap libjpeg-dev zlib1g-dev unzip wget graphviz
 
+    # install capstone
+    curl -o /tmp/libcapstone3.deb http://www.capstone-engine.org/download/3.0.4/ubuntu-14.04/libcapstone3_3.0.4-0.1ubuntu1_amd64.deb
+    sudo dpkg -i /tmp/libcapstone3.deb
+
     # only python package we install globally
     sudo -H $PIP install virtualenv
-
-    echo "fetching BAP deps"
-    sudo apt-get install -qq -y software-properties-common libgmp-dev llvm-3.4-dev time clang-3.4
-
-    echo "installing ocaml and opam"
-    echo 'yes' | sudo add-apt-repository ppa:avsm/ocaml42+opam12
-    sudo apt-get update -qq
-    sudo apt-get install -qq -y ocaml ocaml-native-compilers camlp4-extra opam
   elif [ $(which pacman) ]; then
     echo "installing pip"
     sudo pacman -S base-devel python2-pip
@@ -40,10 +36,6 @@ if [[ "$unamestr" == 'Linux' ]]; then
   fi
 fi
 
-# do you like waiting a long time?
-# you should install BAP!
-./bap_install.sh
-
 echo "installing pip packages"
 virtualenv venv
 source venv/bin/activate

middleware/qira.py

@@ -55,19 +55,12 @@ if __name__ == '__main__':
   else:
     qira_config.USE_PIN = args.pin
 
-  if qira_config.USE_PIN:
-    qira_config.WITH_CAPSTONE = True
 
   qira_config.HOST = args.host
   qira_config.WEB_PORT = args.web_port
   qira_config.SOCAT_PORT = args.socat_port
   qira_config.FORK_PORT = args.socat_port + 1
-  if qira_config.WITH_CAPSTONE:
-    try:
-      from capstone import *
-    except:
-      print "*** warning: WITH_CAPSTONE enabled but capstone not installed."
-      qira_config.WITH_CAPSTONE = False
+
   if args.tracelibraries:
     qira_config.TRACE_LIBRARIES = True
   if args.static:

middleware/qira_config.py

@@ -14,9 +14,8 @@ else:
 BASEDIR = os.path.realpath(os.path.dirname(os.path.realpath(__file__))+"/../")
 sys.path.append(BASEDIR)
 
-# capstone is now a requirement
-WITH_CAPSTONE = True
-WITH_BAP = True
+# BAP is no longer supported
+WITH_BAP = False
 
 # it's time for this to be true
 # required for the next release
@@ -24,3 +23,4 @@ WITH_STATIC = True
 STATIC_ENGINE = "builtin"
 
 WEBSOCKET_DEBUG = False
+

qira

@@ -1,6 +1,5 @@
 #!/bin/bash -e
 DIR=$(dirname $(readlink -f $0))
 source $DIR/venv/bin/activate
-eval $(opam config env)
 exec /usr/bin/env python2.7 $DIR/middleware/qira.py $*