From 126b8053aa08b739f5d41a0ace498fd82e7e79b1 Mon Sep 17 00:00:00 2001
From: Florian Sonnenschein <florian.sonnenschein@grandcentrix.net>
Date: Mon, 11 Mar 2024 12:14:31 +0100
Subject: [PATCH] PKGS-7303: Added version numbers to brew packages. This
 allows lynis enterprise to render the software  packages in the webinterface.

---
 include/tests_ports_packages | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/tests_ports_packages b/include/tests_ports_packages
index 81babdc3..5fded96e 100644
--- a/include/tests_ports_packages
+++ b/include/tests_ports_packages
@@ -127,11 +127,15 @@
         LogText "Test: Querying brew to get package list"
         Display --indent 4 --text "- Querying brew for installed packages"
         LogText "Output:"; LogText "-----"
-        GPACKAGES=$(brew list)
-        for J in ${GPACKAGES}; do
-            LogText "Found package ${J}"
-            INSTALLED_PACKAGES="${INSTALLED_PACKAGES}|${J}"
-        done
+        GPACKAGES=$(brew list --versions)
+        while IFS= read -r PKG; do
+            PACKAGE_NAME=$(echo ${PKG} | ${CUTBINARY} -d ' ' -f1)
+            PACKAGE_VERSION=$(echo ${PKG} | ${CUTBINARY} -d ' ' -f2)
+            LogText "Found package: ${PACKAGE_NAME} (version: ${PACKAGE_VERSION})"
+            INSTALLED_PACKAGES="${INSTALLED_PACKAGES}|${PACKAGE_NAME},${PACKAGE_VERSION}"
+        done << EOF
+$GPACKAGES
+EOF
     else
         LogText "Result: brew can NOT be found on this system"
     fi