From ab17f170a57c1212d488fb24839be120a7d438e1 Mon Sep 17 00:00:00 2001
From: Stefan Baumgartner <sbaumgartner75@users.noreply.github.com>
Date: Sun, 19 May 2024 12:23:56 +0200
Subject: [PATCH 1/4] Fix regex for NETW-3200

---
 include/tests_networking | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tests_networking b/include/tests_networking
index 44a65708..24bfc7d1 100644
--- a/include/tests_networking
+++ b/include/tests_networking
@@ -750,7 +750,7 @@
                         UNCOMMON_PROTOCOL_DISABLED=0
                         # First check modprobe.conf
                         if [ -f ${ROOTDIR}etc/modprobe.conf ]; then
-                            DATA=$(${GREPBINARY} "^install \+${P} \+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf)
+                            DATA=$(${GREPBINARY} "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf)
                             if [ -n "${DATA}" ]; then
                                 LogText "Result: found ${P} module disabled via modprobe.conf"
                                 UNCOMMON_PROTOCOL_DISABLED=1
@@ -759,7 +759,7 @@
                         # Then additional modprobe configuration files
                         if [ -d ${ROOTDIR}etc/modprobe.d ]; then
                             # Return file names (-l) and suppress errors (-s)
-                            DATA=$(${GREPBINARY} -l -s "^install \+${P} \+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*)
+                            DATA=$(${GREPBINARY} -l -s "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*)
                             if [ -n "${DATA}" ]; then
                                 UNCOMMON_PROTOCOL_DISABLED=1
                                 for F in ${DATA}; do

From 0515094a337a092b8ae530e6fa94ba583827c1fe Mon Sep 17 00:00:00 2001
From: Stefan Baumgartner <sbaumgartner75@users.noreply.github.com>
Date: Sun, 19 May 2024 12:34:57 +0200
Subject: [PATCH 2/4] Fix REGEX in FILE-6430

---
 include/tests_filesystems | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tests_filesystems b/include/tests_filesystems
index cabc27e7..3bc5ec3e 100644
--- a/include/tests_filesystems
+++ b/include/tests_filesystems
@@ -877,8 +877,8 @@
                 fi
                 FIND=$(${LSBINARY} ${ROOTDIR}etc/modprobe.d/* 2> /dev/null)
                 if [ -n "${FIND}" ]; then
-                    FIND1=$(${GREPBINARY} -E "^blacklist \+${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
-                    FIND2=$(${GREPBINARY} -E "^install \+${FS} \+/bin/true$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
+                    FIND1=$(${GREPBINARY} -E "^blacklist +${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
+                    FIND2=$(${GREPBINARY} -E "^install +${FS} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
                         if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then
                             Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN
                             LogText "Result: module ${FS} is blacklisted"

From a6da9336af579703887e12cffe6a42ce55827756 Mon Sep 17 00:00:00 2001
From: Stefan Baumgartner <sbaumgartner75@users.noreply.github.com>
Date: Fri, 24 May 2024 08:15:50 +0200
Subject: [PATCH 3/4] Update tests_networking

More elegant regex to accommodate for tabs and spaces.
---
 include/tests_networking | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tests_networking b/include/tests_networking
index 24bfc7d1..764204cf 100644
--- a/include/tests_networking
+++ b/include/tests_networking
@@ -750,7 +750,7 @@
                         UNCOMMON_PROTOCOL_DISABLED=0
                         # First check modprobe.conf
                         if [ -f ${ROOTDIR}etc/modprobe.conf ]; then
-                            DATA=$(${GREPBINARY} "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf)
+                            DATA=$(${GREPBINARY} -E "^install[[:space:]]+${P}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf)
                             if [ -n "${DATA}" ]; then
                                 LogText "Result: found ${P} module disabled via modprobe.conf"
                                 UNCOMMON_PROTOCOL_DISABLED=1
@@ -759,7 +759,7 @@
                         # Then additional modprobe configuration files
                         if [ -d ${ROOTDIR}etc/modprobe.d ]; then
                             # Return file names (-l) and suppress errors (-s)
-                            DATA=$(${GREPBINARY} -l -s "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*)
+                            DATA=$(${GREPBINARY} -l -s -E "^install[[:space:]]+${P}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*)
                             if [ -n "${DATA}" ]; then
                                 UNCOMMON_PROTOCOL_DISABLED=1
                                 for F in ${DATA}; do

From 9eafa7913c979033cf8c9d704e899bf553e211ac Mon Sep 17 00:00:00 2001
From: Stefan Baumgartner <sbaumgartner75@users.noreply.github.com>
Date: Fri, 24 May 2024 08:18:16 +0200
Subject: [PATCH 4/4] Update tests_filesystems

More elegant regex to accommodate for tabs and spaces.
---
 include/tests_filesystems | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tests_filesystems b/include/tests_filesystems
index 3bc5ec3e..58efe975 100644
--- a/include/tests_filesystems
+++ b/include/tests_filesystems
@@ -877,8 +877,8 @@
                 fi
                 FIND=$(${LSBINARY} ${ROOTDIR}etc/modprobe.d/* 2> /dev/null)
                 if [ -n "${FIND}" ]; then
-                    FIND1=$(${GREPBINARY} -E "^blacklist +${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
-                    FIND2=$(${GREPBINARY} -E "^install +${FS} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
+                    FIND1=$(${GREPBINARY} -E "^blacklist[[:space:]]+${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
+                    FIND2=$(${GREPBINARY} -E "^install[[:space:]]+${FS}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
                         if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then
                             Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN
                             LogText "Result: module ${FS} is blacklisted"