First commit after fork. Conflict resolution in include/tests_boot_services and include/tests_kernel.

.gitignore

@@ -1,2 +1,6 @@
 .bzr
 .bzrignore
+kernels.txt
+*.new
+*.old
+*.patch

README.md

@@ -1,5 +1,4 @@
 lynis
-=====
 
 Lynis - Security auditing and hardening tool for Unix/Linux based systems
 
@@ -10,4 +9,4 @@ Lynis is an security auditing and hardening tool for Unix derivatives like Linux
 See for full documentation http://cisofy.com/documentation/lynis/
 
 <h1>Support</h1>
-Got an improvement to share? Create an issue in the tracker on GitHub or send us an e-mail: lynis-dev@cisofy.com
+Got an improvement to share? Create an issue in the tracker on GitHub or send us an e-mail: lynis-dev@cisofy.com

include/tests_boot_services

@@ -542,11 +542,19 @@
                    ReportException "${TEST_NO}:2" "No uptime test available for this operating system (kstat missing)"
                fi
               ;;
+            MacOS)
+                if [ ! "${SYSCTLBINARY}" = "" ]; then
+                    FIND=`${SYSCTLBINARY} kern.boottime | awk '{ print $5 }' | sed -e 's/,//'`
+                else
+                    Display --indent 2 --text "- Checking uptime" --result SKIPPED --color YELLOW
+                    ReportException "${TEST_NO}:3" "No uptine test available for this operating system (sysctl missing)"
+                fi
+                ;;
             *)
                Display --indent 2 --text "- Checking uptime" --result SKIPPED --color YELLOW
 
                # Want to help improving Lynis? Share your operating system and a way to determine the uptime (in seconds)
-               ReportException "${TEST_NO}:3" "No uptime test available yet for this operating system"
+               ReportException "${TEST_NO}:4" "No uptime test available yet for this operating system"
               ;;
         esac
         if [ ! "${FIND}" = "" ]; then

include/tests_malware

@@ -200,6 +200,30 @@
 #
 #################################################################################
 #
+#################################################################################
+#
+# ClamXav (Mac OS X Specific)
+#
+#################################################################################
+#
+#    Test        : MALW-3299
+#    Description : Check for ClamXav
+#
+#################################################################################
+    Register --test-no MALW-3299 --weight L --network NO --description "Check for ClamXav"
+    if [ ${SKIPTEST} -eq 0 ]; then
+        CLAMSCANBINARY=`ls /Applications/ClamXav.app/Contents/Resources/ScanningEngine/bin/ | grep 'clamscan'`
+        if [ ! "${CLAMSCANBINARY}" = "" ]; then
+             logtext "Result: Found ClamXav clamscan installed"
+             Display --indent 2 --text "- Checking presence of ClamXav AV scanner" --result "FOUND" --color GREEN
+             MALWARE_SCANNER_INSTALLED=1
+             AddHP 3 3
+        else
+            logtext "Result: ClamXav malware scanner not found"
+            Display --indent 2 --text "- Checking presence of ClamXav AV scanner" --result "NOT FOUND" --color YELLOW
+            AddHP 0 3
+       fi
+    fi
 
 report "malware_scanner_installed=${MALWARE_SCANNER_INSTALLED}"
 

include/tests_webservers

@@ -295,10 +295,16 @@
         if [ ${ITEM_FOUND} -eq 1 ]; then
             Display --indent 10 --text "mod_evasive: anti-DoS/brute force" --result FOUND --color GREEN
             AddHP 3 3
-          else
+        else
+	    #CheckItem "apache_module" "mod_evasive.so"
+	    #if [ ${ITEM_FOUND} -eq 1 ]; then
+	    #    Display --indent 10 --text "mod_evasive: anti-DoS/brute force" --result FOUND --color GREEN
+	    #	AddHP 3 3
+	    #else 
             Display --indent 10 --text "mod_evasive: anti-DoS/brute force" --result "NOT FOUND" --color WHITE
             AddHP 2 3
             ReportSuggestion ${TEST_NO} "Install Apache mod_evasive to guard webserver against DoS/brute force attempts"
+	    #fi
         fi
     fi
 #