From cb55fa66eca6a8df8ebabe136fbca1eda14b5e1e Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 28 Aug 2018 15:53:50 -0300
Subject: [PATCH 1/6] Fix manticore

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9dc83af..7ad3edc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,7 @@ install:
 - pip install pyflakes
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev
-- sudo pip install -U pip ; sudo pip install manticore
-- sudo pip uninstall -y Manticore || echo "Manticore not cached"
-- sudo pip install https://github.com/trailofbits/manticore/archive/last_python2.zip
+- sudo pip install -U pip ; sudo pip install https://github.com/trailofbits/manticore/archive/last_python2.zip
 - mkdir build
 - cd build
 - cmake ..

From 38b438d55ebbf9d072551f506a912d9f445ad09a Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 28 Aug 2018 16:16:58 -0300
Subject: [PATCH 2/6] Update .travis.yml

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7ad3edc..cd8ec52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,10 @@ install:
 - pip install pyflakes
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev
-- sudo pip install -U pip ; sudo pip install https://github.com/trailofbits/manticore/archive/last_python2.zip
+- sudo pip2 install -U pip2 
+- wget https://github.com/trailofbits/manticore/archive/last_python2.zip
+- unzip last_python2.zip
+- cd manticore-last_python2 ; python2 setup install --user ; cd -
 - mkdir build
 - cd build
 - cmake ..

From 316a8c59cef090d9ecdf383c7c961edfb4e7987c Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 28 Aug 2018 17:05:17 -0300
Subject: [PATCH 3/6] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd8ec52..22a1da2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ install:
 - pip install pyflakes
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev
-- sudo pip2 install -U pip2 
+- sudo pip2 install -U pip 
 - wget https://github.com/trailofbits/manticore/archive/last_python2.zip
 - unzip last_python2.zip
 - cd manticore-last_python2 ; python2 setup install --user ; cd -

From ef30504908beaa13ae934cf3880828870788a261 Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 28 Aug 2018 18:16:30 -0300
Subject: [PATCH 4/6] Fix manticore version

---
 bin/setup.py.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/setup.py.in b/bin/setup.py.in
index f1eca5b..b926ffa 100644
--- a/bin/setup.py.in
+++ b/bin/setup.py.in
@@ -30,7 +30,7 @@ setuptools.setup(
     author_email="peter@trailofbits.com",
     license="Apache-2.0",
     keywords="tdd testing symbolic execution",
-    install_requires=['claripy==7.8.6.16','angr==7.8.7.1', 'manticore'],
+    install_requires=['claripy==7.8.6.16','angr==7.8.7.1', 'manticore==0.1.10'],
     entry_points={
         'console_scripts': [
             'deepstate = deepstate.main_manticore:main',

From 5a2c6460f8052614d7df4f8a8636a96e03ab3f9b Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 28 Aug 2018 18:16:52 -0300
Subject: [PATCH 5/6] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 22a1da2..e950aae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ install:
 - sudo pip2 install -U pip 
 - wget https://github.com/trailofbits/manticore/archive/last_python2.zip
 - unzip last_python2.zip
-- cd manticore-last_python2 ; python2 setup install --user ; cd -
+- cd manticore-last_python2 ; python2 setup.py install --user ; cd -
 - mkdir build
 - cd build
 - cmake ..

From e7a7b7d68f050d990a8521a6dee8c6c7228d9801 Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 28 Aug 2018 19:54:34 -0300
Subject: [PATCH 6/6] Update .travis.yml

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e950aae..d83e607 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,9 @@ install:
 - pip install pyflakes
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev
-- sudo pip2 install -U pip 
-- wget https://github.com/trailofbits/manticore/archive/last_python2.zip
-- unzip last_python2.zip
-- cd manticore-last_python2 ; python2 setup.py install --user ; cd -
+- sudo pip2 install -U pip
+- sudo pip install z3-solver
+- sudo pip install https://github.com/trailofbits/manticore/archive/last_python2.zip
 - mkdir build
 - cd build
 - cmake ..