From b28d7035834234d172bd6a43483542c881f7c49a Mon Sep 17 00:00:00 2001
From: Seth Grover <mero.mero.guero@gmail.com>
Date: Wed, 14 Feb 2024 14:11:19 -0700
Subject: [PATCH 1/4] fix typo

---
 docker-compose-dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 98fc7ca56..0639b407a 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -341,7 +341,7 @@ services:
       # NET_ADMIN and NET_RAW - to turn on promiscuous mode and capture raw packets
       - NET_ADMIN
       - NET_RAW
-      # SYS_NICE - to set process nice values, real-timescheduling policies, I/O scheduling
+      # SYS_NICE - to set process nice values, real-time scheduling policies, I/O scheduling
       - SYS_NICE
     env_file:
       - ./config/process.env

From 5fb30238d76dc89cf451e63f6afef6915d5d248b Mon Sep 17 00:00:00 2001
From: Seth Grover <mero.mero.guero@gmail.com>
Date: Wed, 14 Feb 2024 20:15:29 -0700
Subject: [PATCH 2/4] fix hanging raspi build

---
 sensor-raspi/sensor_install.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sensor-raspi/sensor_install.sh b/sensor-raspi/sensor_install.sh
index 51dc32ed6..43035a49a 100644
--- a/sensor-raspi/sensor_install.sh
+++ b/sensor-raspi/sensor_install.sh
@@ -77,17 +77,22 @@ build_arkime_src(){
     mkdir -p "${WORK_DIR}/arkime" && cd "$_"
     git clone --recurse-submodules --branch="v${arkime_ver}" "$arkime_repo" ./
 
-    # I'm getting "Client network socket disconnected before secure TLS connection was established" when building Arkime,
-    #   and this workaround seems to address it (see https://github.com/npm/cli/issues/4652)
-    for FILE in $(grep -rIcH 'npm ci' ./ | grep -v ':0$' | cut -d: -f 1); do sed -i "s/npm ci/npm ci --maxsockets 1/g" "$FILE"; done
-
     for patch_file in /opt/patches/*.patch; do
         patch -p 1 -r - --no-backup-if-mismatch < $patch_file || true
     done
 
     export PATH="${arkime_dir}/bin:${WORK_DIR}/arkime/node_modules/.bin:${PATH}"
 
+    # I'm getting "Client network socket disconnected before secure TLS connection was established" when building Arkime,
+    #   and this workaround seems to address it (see https://github.com/npm/cli/issues/4652)
+    for FILE in $(grep -rIcH 'npm ci' ./ | grep -v ':0$' | cut -d: -f 1); do sed -i "s/npm ci/npm ci --maxsockets 1/g" "$FILE"; done
+
+    # and this is also hanging... :(
+    sed -i '/license-checker/d' screwdriver.yaml
+
+    # configure the number of build threads
     sed -i "s/MAKE=make/MAKE='make -j${build_jobs}'/" easybutton-build.sh
+
     ./easybutton-build.sh --dir "$arkime_dir"
 
     make install -j${build_jobs}

From e3c83d289d038d2ccd83b1063fe9fc1c0c9e11e6 Mon Sep 17 00:00:00 2001
From: Seth Grover <mero.mero.guero@gmail.com>
Date: Thu, 15 Feb 2024 04:35:58 -0700
Subject: [PATCH 3/4] workaround for hanging build

---
 sensor-raspi/sensor_install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sensor-raspi/sensor_install.sh b/sensor-raspi/sensor_install.sh
index 43035a49a..fd3372e5e 100644
--- a/sensor-raspi/sensor_install.sh
+++ b/sensor-raspi/sensor_install.sh
@@ -99,8 +99,10 @@ build_arkime_src(){
 
     cp -r ./capture/plugins/lua/samples "${arkime_dir}"/lua
 
-    npm install license-checker
-    release/notice.txt.pl "${arkime_dir}/" NOTICE release/CAPTURENOTICE > "${arkime_dir}/NOTICE.txt"
+    # as I said above, license-checker is hanging on me
+    #   npm install license-checker
+    #   release/notice.txt.pl "${arkime_dir}/" NOTICE release/CAPTURENOTICE > "${arkime_dir}/NOTICE.txt"
+    cat NOTICE release/CAPTURENOTICE > "${arkime_dir}/NOTICE.txt"
 
     rm -f $arkime_dir/etc/*.systemd.service
 

From 9b227b48e74598d97d45c4327269a95150d40201 Mon Sep 17 00:00:00 2001
From: Seth Grover <mero.mero.guero@gmail.com>
Date: Thu, 15 Feb 2024 06:36:24 -0700
Subject: [PATCH 4/4] adjust creation of NOTICE.txt for arkime

---
 sensor-iso/arkime/build-arkime-deb.sh | 3 +--
 sensor-raspi/sensor_install.sh        | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/sensor-iso/arkime/build-arkime-deb.sh b/sensor-iso/arkime/build-arkime-deb.sh
index a1f5bce9d..e1b43f15e 100755
--- a/sensor-iso/arkime/build-arkime-deb.sh
+++ b/sensor-iso/arkime/build-arkime-deb.sh
@@ -35,8 +35,7 @@ make install
 
 cp -r ./capture/plugins/lua/samples "$ARKIME_DIR"/lua
 
-npm install license-checker
-release/notice.txt.pl $ARKIME_DIR NOTICE release/CAPTURENOTICE > $ARKIME_DIR/NOTICE.txt
+cat NOTICE release/CAPTURENOTICE > $ARKIME_DIR/NOTICE.txt
 
 ETC_FILES=$(shopt -s nullglob dotglob; echo /arkime-etc/*)
 if (( ${#ETC_FILES} )) ; then
diff --git a/sensor-raspi/sensor_install.sh b/sensor-raspi/sensor_install.sh
index fd3372e5e..d84b1d8c3 100644
--- a/sensor-raspi/sensor_install.sh
+++ b/sensor-raspi/sensor_install.sh
@@ -87,9 +87,6 @@ build_arkime_src(){
     #   and this workaround seems to address it (see https://github.com/npm/cli/issues/4652)
     for FILE in $(grep -rIcH 'npm ci' ./ | grep -v ':0$' | cut -d: -f 1); do sed -i "s/npm ci/npm ci --maxsockets 1/g" "$FILE"; done
 
-    # and this is also hanging... :(
-    sed -i '/license-checker/d' screwdriver.yaml
-
     # configure the number of build threads
     sed -i "s/MAKE=make/MAKE='make -j${build_jobs}'/" easybutton-build.sh
 
@@ -99,9 +96,6 @@ build_arkime_src(){
 
     cp -r ./capture/plugins/lua/samples "${arkime_dir}"/lua
 
-    # as I said above, license-checker is hanging on me
-    #   npm install license-checker
-    #   release/notice.txt.pl "${arkime_dir}/" NOTICE release/CAPTURENOTICE > "${arkime_dir}/NOTICE.txt"
     cat NOTICE release/CAPTURENOTICE > "${arkime_dir}/NOTICE.txt"
 
     rm -f $arkime_dir/etc/*.systemd.service