From 968a3c3502fba8ec22e4a2ffd7e0cca7ca5de591 Mon Sep 17 00:00:00 2001
From: Ryan MacDonald <ryan@rfxn.com>
Date: Fri, 13 Jan 2017 16:50:10 -0500
Subject: [PATCH] [Fix] importconf was setting invalid vars for custom
 signature imports; correct       variables are import_sigs_md5_url and
 import_sigs_hex_url [Fix] added use of sed flag -E for FreeBSD compatibility
 with GNU sed usage

---
 files/VERSION.hash                    | 2 +-
 files/clean/base64.inject.unclassed   | 2 +-
 files/clean/gzbase64.inject.unclassed | 2 +-
 files/clean/js.inject.VisitorTracker  | 2 +-
 files/clean/js.inject.fakejquery02    | 2 +-
 files/clean/php.brute.bf1lic          | 2 +-
 files/internals/functions             | 5 +++--
 files/internals/importconf            | 4 ++--
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/files/VERSION.hash b/files/VERSION.hash
index eaf7a79..8024839 100644
--- a/files/VERSION.hash
+++ b/files/VERSION.hash
@@ -1 +1 @@
-09b93cbbc7a572eec62c23cb319b5ab98b9bb20d7ac0f916793d8239dcc6b25d
\ No newline at end of file
+09b93cbbc7a572eec62c23cb319b5ab9968e70acaf56bce46759c94ddeaadc3b
\ No newline at end of file
diff --git a/files/clean/base64.inject.unclassed b/files/clean/base64.inject.unclassed
index cee0501..6f87a94 100755
--- a/files/clean/base64.inject.unclassed
+++ b/files/clean/base64.inject.unclassed
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # $1 file path, $2 signature name, $3 file owner, $4 file mode, $5 file size (b), $6 file md5sum
 if [ -f "$1" ]; then
-	sed -i -e 's/<?.*eval(base64_decode(.*?>//' -e 's/<?php.*eval(base64_decode(.*?>//' -e 's/eval(base64_decode([^;]*;//' "$1"
+	sed -E -i -e 's/<?.*eval(base64_decode(.*?>//' -e 's/<?php.*eval(base64_decode(.*?>//' -e 's/eval(base64_decode([^;]*;//' "$1"
 fi
diff --git a/files/clean/gzbase64.inject.unclassed b/files/clean/gzbase64.inject.unclassed
index d6b73ee..5f2ac31 100755
--- a/files/clean/gzbase64.inject.unclassed
+++ b/files/clean/gzbase64.inject.unclassed
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # $1 file path, $2 signature name, $3 file owner, $4 file mode, $5 file size (b), $6 file md5sum
 if [ -f "$1" ]; then
-	sed -i -e 's/<?.*eval(gzinflate(base64_decode(.*?>//' -e 's/<?php.*eval(gzinflate(base64_decode(.*?>//' -e 's/eval(gzinflate(base64_decode(.*);//' "$1"
+	sed -E -i -e 's/<?.*eval(gzinflate(base64_decode(.*?>//' -e 's/<?php.*eval(gzinflate(base64_decode(.*?>//' -e 's/eval(gzinflate(base64_decode(.*);//' "$1"
 fi
diff --git a/files/clean/js.inject.VisitorTracker b/files/clean/js.inject.VisitorTracker
index 1c9c9a2..9b983e1 100755
--- a/files/clean/js.inject.VisitorTracker
+++ b/files/clean/js.inject.VisitorTracker
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # $1 file path, $2 signature name, $3 file owner, $4 file mode, $5 file size (b), $6 file md5sum
 if [ -f "$1" ]; then
-	sed -i -e '/var visitortrackerin = setInterval(function(){/,/}\/\*visitorTracker\*\//d' -e '/\/\*visitorTracker\*\//d' "$1"
+	sed -E -i -e '/var visitortrackerin = setInterval(function(){/,/}\/\*visitorTracker\*\//d' -e '/\/\*visitorTracker\*\//d' "$1"
 fi
diff --git a/files/clean/js.inject.fakejquery02 b/files/clean/js.inject.fakejquery02
index a453d63..8136466 100755
--- a/files/clean/js.inject.fakejquery02
+++ b/files/clean/js.inject.fakejquery02
@@ -1,6 +1,6 @@
 #!/bin/bash
 # $1 file path, $2 signature name, $3 file owner, $4 file mode, $5 file size (b), $6 file md5sum
 if [ -f "$1" ]; then
-        sed -i -e '/<script>var.*jquery.min.php?.*encodeURIComponent.*jquery.min.php.*document.getElementsByTagName.*window.location.search.match.*;}<\/script>/d' "$1"
+        sed -E -i -e '/<script>var.*jquery.min.php?.*encodeURIComponent.*jquery.min.php.*document.getElementsByTagName.*window.location.search.match.*;}<\/script>/d' "$1"
 fi
 
diff --git a/files/clean/php.brute.bf1lic b/files/clean/php.brute.bf1lic
index 3adfb4d..5e09cce 100755
--- a/files/clean/php.brute.bf1lic
+++ b/files/clean/php.brute.bf1lic
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # $1 file path, $2 signature name, $3 file owner, $4 file mode, $5 file size (b), $6 file md5sum
 if [ -f "$1" ]; then
-	sed -i -e 's/^<?php if(!isset($GLOBALS\[\"\\x.*; ?>//' "$1"
+	sed -E -i -e 's/^<?php if(!isset($GLOBALS\[\"\\x.*; ?>//' "$1"
 fi
diff --git a/files/internals/functions b/files/internals/functions
index cfbbda6..83a2eff 100644
--- a/files/internals/functions
+++ b/files/internals/functions
@@ -134,7 +134,7 @@ prerun() {
 	fi
 	
 	if [ "$user" == "root" ]; then
-		sed -i '/^$/d' $ignore_paths $ignore_sigs $ignore_inotify $ignore_file_ext
+		sed -E -i -e '/^$/d' $ignore_paths $ignore_sigs $ignore_inotify $ignore_file_ext
 	fi
 
 	if [ -z "$EDITOR" ]; then
@@ -149,6 +149,7 @@ prerun() {
 	if [ ! "$scan_cpunice" ]; then
 		scan_cpunice=19
 	fi
+
 	if [ ! "$scan_ionice" ]; then
 		scan_ionice=6
 	fi
@@ -1103,7 +1104,7 @@ scan_strlen() {
 	elif [ "$string_length_scan" == "1" ] && [ "$type" == "list" ]; then
 		list="$tmpdir/.strlen.flist.$$"
 		cp $file $list
-		sed -i "s/'/\\\\'/g" $list
+		sed -E -i -e "s/'/\\\\'/g" $list
 		cat $list | xargs wc -L 2> /dev/null | grep -vw total >> $list.strlen
 		awk "{if (\$1>=$string_length) print\$2}" $list.strlen >> $list.hits
 		for i in `cat $list.hits`; do
diff --git a/files/internals/importconf b/files/internals/importconf
index fde3a00..754bafa 100644
--- a/files/internals/importconf
+++ b/files/internals/importconf
@@ -63,8 +63,8 @@ import_config_url=""
 # SIGNATURE FILES! It is recommended for large-scale deployments to define these
 # variables within a import_config_url file.
 # [ some IP use dns caption recommendation goes here ]
-import_custsigs_md5_url=""
-import_custsigs_hex_url=""
+import_sigs_md5_url="$import_sigs_md5_url"
+import_sigs_hex_url="$import_sigs_hex_url"
 
 ##
 # [ SCAN OPTIONS ]