From b3e355444b311f851747eae3d3cae74e6fe9d9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C5=BEe=20=C5=BDitnik?= <anze.zitnik@xlab.si>
Date: Tue, 5 Mar 2019 14:54:45 +0100
Subject: [PATCH] lz4 library version updated to fix hang on install

---
 Dockerfile       | 2 +-
 README.md        | 1 -
 install.sh       | 1 +
 requirements.txt | 2 +-
 w3af-lz4.patch   | 4 ++++
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 w3af-lz4.patch

diff --git a/Dockerfile b/Dockerfile
index 849fc0d..029efa0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:16.04
 
-COPY install.sh zap-plugin.patch w3af-plugin.patch w3af_output_fix.patch cscan-config.py run-cscan.sh requirements.txt /tmp/
+COPY install.sh zap-plugin.patch w3af-plugin.patch w3af_output_fix.patch w3af-lz4.patch cscan-config.py run-cscan.sh requirements.txt /tmp/
 COPY wiser-wcs-reports /root/wiser-wcs-reports/
 
 RUN chmod +x /tmp/install.sh /tmp/run-cscan.sh && \
diff --git a/README.md b/README.md
index 9fabfdd..b29f700 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,6 @@ or `make start` (default TARGET=http://10.10.43.182, OUTPUT_DIR none).
 ### TODOs and FIXMEs:
 
 * use cscan from Faraday repo (newer?)
-* include a basic test into CI script and Makefile
 * include some configuration options (at least authenticated scans for w3af)
 
 
diff --git a/install.sh b/install.sh
index 6d70301..38aed7d 100644
--- a/install.sh
+++ b/install.sh
@@ -27,6 +27,7 @@ mv w3af-0e6dc291a45dd4d5dae94bde301a10c7cb560578 /root/w3af &&
 #cp ~/extended_generic.py w3af/plugins/auth/ &&
 #enable other output plugins for w3af API
 patch /root/w3af/w3af/core/ui/api/utils/scans.py /tmp/w3af_output_fix.patch &&
+patch /root/w3af/w3af/core/controllers/dependency_check/requirements.py /tmp/w3af-lz4.patch &&
 
 #ZAP
 apt install -y openjdk-8-jre &&
diff --git a/requirements.txt b/requirements.txt
index 6df8251..6280d4c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,7 +38,7 @@ jsonpointer==2.0
 jsonref==0.2
 jsonschema==3.0.1
 lxml==3.4.4
-lz4==1.1.0
+lz4==2.1.6
 mac-alias==2.0.7
 Markdown==2.6.1
 MarkupSafe==1.1.1
diff --git a/w3af-lz4.patch b/w3af-lz4.patch
new file mode 100644
index 0000000..2c01407
--- /dev/null
+++ b/w3af-lz4.patch
@@ -0,0 +1,4 @@
+98c98
+<                      PIPDependency('lz4', 'lz4', '1.1.0'),
+---
+>                      PIPDependency('lz4', 'lz4', '2.1.6'),
-- 
GitLab