From 634e6a3549ed5119bad609c635ce897e18fa9d0a Mon Sep 17 00:00:00 2001
From: Jeremy Grossmann <grossmj@gns3.net>
Date: Tue, 20 Dec 2022 21:28:46 +0800
Subject: [PATCH 1/4] Update SECURITY.md

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 7161ebd1..b2ad79b8 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -14,4 +14,4 @@ currently being supported with security updates.
 
 ## Reporting a Vulnerability
 
-Please contact us at security@gns3.net
+Please use GitHub's report a vulnerability feature. More information can be found in https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability

From 1c183e660f90619c259669fd8e2c8df039714643 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Sun, 18 Dec 2022 14:24:50 +0800
Subject: [PATCH 2/4] Downgrade Ubuntu to 20.04 to fix missing Python 3.6

---
 .github/workflows/testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 161878b9..10347cd3 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04  # Downgrade Ubuntu to 20.04 to fix missing Python 3.6
     strategy:
       matrix:
         python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]

From 7f440f43d8dd95f2c5435d99c3e7fefc68cd29d2 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 27 Dec 2022 12:25:49 +0800
Subject: [PATCH 3/4] Add more base branches for Mend to scan

---
 .whitesource | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.whitesource b/.whitesource
index 60fc783c..9bcbb1df 100644
--- a/.whitesource
+++ b/.whitesource
@@ -2,7 +2,8 @@
   "scanSettings": {
     "configMode": "AUTO",
     "configExternalURL": "",
-    "projectToken" : ""
+    "projectToken" : "",
+    "baseBranches": ["master", ""2.2", "3.0"]
   },
   "checkRunSettings": {
     "vulnerableCheckRunConclusionLevel": "failure"

From 9f75a49e0a46126cbd66920f1ef1f7179cee22ed Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 27 Dec 2022 12:27:26 +0800
Subject: [PATCH 4/4] Fix syntax error in .whitesource

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

diff --git a/.whitesource b/.whitesource
index 9bcbb1df..e112468f 100644
--- a/.whitesource
+++ b/.whitesource
@@ -3,7 +3,7 @@
     "configMode": "AUTO",
     "configExternalURL": "",
     "projectToken" : "",
-    "baseBranches": ["master", ""2.2", "3.0"]
+    "baseBranches": ["master", "2.2", "3.0"]
   },
   "checkRunSettings": {
     "vulnerableCheckRunConclusionLevel": "failure"