changes to snort.inc, snort_downloads_rules.php, pkg_config.7.xml. libdnet-1.11_3.tbz still missing

1 files changed, 12 insertions, 2 deletions

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 6fa3fcca..1b8d5571 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -778,9 +778,11 @@ function verify_snort_rules_md5($tmpfname) {
 		$static_output = gettext("Verifying md5 signature...");
 		update_all_status($static_output);
 	}
-	$md5 = file_get_contents("{$tmpfname}/{$snort_filename_md5}");
+
+        $md555 = file_get_contents("{$tmpfname}/{$snort_filename_md5}");
+        $md5 = `/bin/echo "{$md555}" | /usr/bin/awk '{ print $4 }'`;
 	$file_md5_ondisk = `/sbin/md5 {$tmpfname}/{$snort_filename} | /usr/bin/awk '{ print $4 }'`;
-	if($md5 <> $file_md5_ondisk) {
+	if($md5 == $file_md5_ondisk) {
 		if(!$console_mode) {
 			$static_output = gettext("snort rules: md5 signature of rules mismatch.");
 			update_all_status($static_output);
@@ -801,6 +803,14 @@ function hide_progress_bar_status() {
 		echo "\n<script type=\"text/javascript\">document.progressbar.style.visibility='hidden';\n</script>";
 }
 
+/* unhide progress bar */
+function unhide_progress_bar_status() {
+        global $snort_filename, $snort_filename_md5, $console_mode;
+        ob_flush();
+        if(!$console_mode)
+                echo "\n<script type=\"text/javascript\">document.progressbar.style.visibility='visible';\n</script>";
+}
+
 /* update both top and bottom text box during an operation */
 function update_all_status($status) {
 	global $snort_filename, $snort_filename_md5, $console_mode;