[Change] find option regextype is now dropped on FreeBSD for compatibility

[Change] report listing, '-e|--report list', now displays scan run time
[Fix] importconf was not importing the value for import_config_url

Author: rfxn

CHANGELOG

@@ -19,6 +19,7 @@ v1.6 | Feb 00 2017:
       these values can also be defined in sysconfig or cron/exec based config files and on CLI
 [New] sysconfig support through '/etc/sysconfig/maldet'  or '/etc/default/maldet', system dependant, to
       allow easier configuration overrides; all conf.maldet and internals.conf variables supported
+[Change] report listing, '-e|--report list', now displays scan run time
 [Change] scan reports and cli outputs once again display simplified path definitions instead of expanded paths
 [Change] unified all clamav selection logic for data paths, running clamd processes, clam(d)scan CLI options etc...
          into a single function, clamselector(); this will make clam behavior more predictable across all functions
@@ -56,7 +57,7 @@ v1.6 | Feb 00 2017:
 [Change] .ca.def configuration template renamed importconf and now copied over during installation to
          'internals/importconf'
 [Change] new versions of 'chown' don't support use of . (dot) to separate user and group
-[Change] swap FreeBSD detection from '$OSTYPE' to 'uname -s'
+[Change] find option regextype is now dropped on FreeBSD for compatibility
 [Change] scan.tpl reporting template handles column spacing on filenames with spaces better
 [Change] CLI usage semantics of --include-regex and --exclude-regex now consistently passing to 'find' command
 [Change] moved all internal field separator line break modifications to lbreakifs()
@@ -75,8 +76,6 @@ v1.6 | Feb 00 2017:
 [Change] clamscan will now respect scan_max_filesize value instead of hardcoded 5M
 [Change] default scan_max_filesize increased from 768k to 2048k
 [Change] clamscan max-scansize for archive depth set as scan_max_filesize*2
-[Change] report listing, '-e|--report list', now displays scan run time
-[Fix] importconf was not importing the value for import_config_url
 [Fix] corrected typo with import_* variables causing configuration imports to fail
 [Fix] suppress eout() output for certain import_*() and get_remote_file() calls; this was causing
       false-positive hits for modsec integration
@@ -126,6 +125,7 @@ v1.6 | Feb 00 2017:
 [Fix] multiplying maldet monitor processes due to 'ps' command expansion under parent bash process on CentOS6
 [Fix] added default installation path to ignore_inotify to prevent monitor looping when '/' is scoped into
       monitoring mode; results in notify log filling disk space
+[Fix] importconf was not importing the value for import_config_url
 
 v1.5 | Sep 19 2015:
 [New] added -f|--file-list CLI option to allow user supplied run-time file list for scanning

CHANGELOG.RELEASE

@@ -59,7 +59,7 @@ v1.6 | Feb 00 2017:
 [Change] .ca.def configuration template renamed importconf and now copied over during installation to
          'internals/importconf'
 [Change] new versions of 'chown' don't support use of . (dot) to separate user and group
-[Change] swap FreeBSD detection from '$OSTYPE' to 'uname -s'
+[Change] find option regextype is now dropped on FreeBSD for compatibility
 [Change] scan.tpl reporting template handles column spacing on filenames with spaces better
 [Change] CLI usage semantics of --include-regex and --exclude-regex now consistently passing to 'find' command
 [Change] moved all internal field separator line break modifications to lbreakifs()

files/internals/internals.conf

@@ -28,7 +28,7 @@ wget_proxy=""
 
 wget=`which wget 2> /dev/null`
 
-if [ "$(echo $OSTYPE | egrep 'FreeBSD')" ]; then
+if [ "$OSTYPE" == "FreeBSD" ]; then
 	md5sum="/sbin/md5 -q"
 else
 	md5sum=`which md5sum 2> /dev/null`
@@ -118,4 +118,5 @@ compatcnf="$libpath/compat.conf"
 
 if [ "$OSTYPE" == "FreeBSD" ]; then
 	sed="$sed -E"
+	find_opts=""
 fi

install.sh

@@ -39,7 +39,7 @@ if [ ! -d "$inspath" ] && [ -d "files" ]; then
 	done
 	killall -SIGUSR2 clamd 2> /dev/null
 else
-	if [ "$(ps -A --user root -o "cmd" | grep maldetect | grep inotifywait)" ]; then
+	if [ "$(ps -A --user root -o "cmd" 2> /dev/null | grep maldetect | grep inotifywait)" ]; then
 		$inspath/maldet -k >> /dev/null 2>&1
 		monmode=1
 	fi