From 2f7d4928cae9f96fa6fd02226896c645d92336c2 Mon Sep 17 00:00:00 2001
From: Jason Kendall <coolacid@users.noreply.github.com>
Date: Mon, 9 Aug 2021 09:52:48 -0400
Subject: [PATCH 1/5] Create FUNDING.yml

---
 .github/FUNDING.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..16bce6f
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [coolacid]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From 1e8c3b02ac6fd1555ce4d6c20821137e06413fa3 Mon Sep 17 00:00:00 2001
From: Anders Einar Hilden <hildenae@gmail.com>
Date: Tue, 19 Oct 2021 19:24:59 +0200
Subject: [PATCH 2/5] libffi-dev needed for v2.4.149

---
 server/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/Dockerfile b/server/Dockerfile
index c1d32e2..19cf46e 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -33,6 +33,7 @@ FROM debian:buster-slim as python-build
         python3-setuptools \
         python3-wheel \
         libfuzzy-dev \
+        libffi-dev \
         ca-certificates \
         && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 

From 5bb1b9da16e22879de7ff7deefeab6f69802efdd Mon Sep 17 00:00:00 2001
From: Anders Einar Hilden <hildenae@gmail.com>
Date: Tue, 19 Oct 2021 19:51:11 +0200
Subject: [PATCH 3/5] Upgrade Composer to 2.1, MISP codebase uses 2.0.9

---
 server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index c1d32e2..63f5030 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:1.9 as composer-build
+FROM composer:2.1 as composer-build
     ARG MISP_TAG
     WORKDIR /tmp
     ADD https://raw.githubusercontent.com/MISP/MISP/${MISP_TAG}/app/composer.json /tmp

From 6061c3e5228e8c46f53e4216c9372206155a1867 Mon Sep 17 00:00:00 2001
From: Anders Einar Hilden <hildenae@gmail.com>
Date: Tue, 19 Oct 2021 20:36:16 +0200
Subject: [PATCH 4/5] misp-modules v2.4.150 requires python 3.8 or a downgrade
 of sigmatools

---
 modules/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/Dockerfile b/modules/Dockerfile
index e8d5e9d..67367f0 100644
--- a/modules/Dockerfile
+++ b/modules/Dockerfile
@@ -19,7 +19,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     WORKDIR /srv
 
     RUN git clone --branch ${MODULES_TAG} --depth 1  https://github.com/MISP/misp-modules.git /srv/misp-modules; \
-        cd /srv/misp-modules || exit; sed -i 's/-e //g' REQUIREMENTS; pip3 wheel -r REQUIREMENTS --no-cache-dir -w /wheel/
+        cd /srv/misp-modules || exit; \
+        sed -i 's/-e //g' -e 's/sigmatools==0.20/sigmatools==0.19.1/' REQUIREMENTS; \
+        pip3 wheel -r REQUIREMENTS --no-cache-dir -w /wheel/
 
     RUN git clone --depth 1 https://github.com/stricaud/faup.git /srv/faup; \
         cd /srv/faup/build || exit; cmake .. && make install; \

From 7ffb57f74ad2d1cc7e712ab0ff5d4d58dcc1c74e Mon Sep 17 00:00:00 2001
From: Anders Einar Hilden <hildenae@gmail.com>
Date: Tue, 19 Oct 2021 20:56:24 +0200
Subject: [PATCH 5/5] sigmatools downgrade: Add comment so we remember to
 upgrade

---
 modules/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/Dockerfile b/modules/Dockerfile
index 67367f0..486fe34 100644
--- a/modules/Dockerfile
+++ b/modules/Dockerfile
@@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     RUN mkdir /wheel
     WORKDIR /srv
 
+    # TODO: remove downgrade of sigmatools when we have Python 3.8 ref #128 and #143
     RUN git clone --branch ${MODULES_TAG} --depth 1  https://github.com/MISP/misp-modules.git /srv/misp-modules; \
         cd /srv/misp-modules || exit; \
         sed -i 's/-e //g' -e 's/sigmatools==0.20/sigmatools==0.19.1/' REQUIREMENTS; \