add various fixes to clamav-unofficial-sigs

This commit is contained in:
sthen 2015-12-08 15:21:53 +00:00
parent e4caff23d1
commit c401667371
2 changed files with 31 additions and 4 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2015/12/08 11:03:29 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2015/12/08 15:21:53 sthen Exp $
COMMENT = fetch and update unofficial signatures for ClamAV
V = 4.9.2
REVISION = 0
REVISION = 1
DISTNAME = clamav-unofficial-sigs-$V
DISTFILES = ${DISTNAME}{$V}.tar.gz

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-clamav-unofficial-sigs_sh,v 1.5 2015/12/07 14:11:02 sthen Exp $
$OpenBSD: patch-clamav-unofficial-sigs_sh,v 1.6 2015/12/08 15:21:53 sthen Exp $
--- clamav-unofficial-sigs.sh.orig Wed Dec 2 10:56:35 2015
+++ clamav-unofficial-sigs.sh Mon Dec 7 14:05:54 2015
+++ clamav-unofficial-sigs.sh Tue Dec 8 15:20:49 2015
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
@ -29,3 +29,30 @@ $OpenBSD: patch-clamav-unofficial-sigs_sh,v 1.5 2015/12/07 14:11:02 sthen Exp $
if [ "$config_version" -lt "$minimum_required_config_version" ] ; then
xshok_pretty_echo_and_log "ERROR: Your configuration version is not compatible with this version" "="
exit 1
@@ -782,7 +790,7 @@ fi
# Check to see if the working directories have been created.
# If not, create them. Otherwise, ignore and proceed with script.
-mkdir -p "$work_dir" "$securiteinfo_dir" "$malwarepatrol_dir" "$linuxmalwaredetect_dir" "$sanesecurity_dir" "$config_dir" "$gpg_dir" "$add_dir"
+mkdir -p "$work_dir" "$securiteinfo_dir" "$malwarepatrol_dir" "$linuxmalwaredetect_dir" "$sanesecurity_dir" "$config_dir" "$gpg_dir" "$add_dir" "$yararules_dir"
# Set secured access permissions to the GPG directory
chmod 0700 "$gpg_dir"
@@ -1433,7 +1441,7 @@ if [ "$yararules_enabled" == "yes" ] ; then
if [ "$time_interval" -ge $(($update_interval - 600)) ] ; then
echo "$current_time" > "$config_dir"/last-yararules-update.txt
- cxshok_pretty_echo_and_log "Yara-Rules Database File Updates" "="
+ xshok_pretty_echo_and_log "Yara-Rules Database File Updates" "="
xshok_pretty_echo_and_log "Checking for yararules updates..."
yararules_updates="0"
for db_file in $yararules_dbs ; do
@@ -3251,7 +3259,7 @@ else
time_remaining=$(($update_interval - $time_interval))
hours_left=$(($time_remaining / 3600))
minutes_left=$(($time_remaining % 3600 / 60))
- xshok_pretty_echo_and_log "$yararules_update_hours hours have not yet elapsed since the last linux malware detect update check"
+ xshok_pretty_echo_and_log "$yararules_update_hours hours have not yet elapsed since the last Yara update check"
xshok_pretty_echo_and_log "No update check was performed at this time" "-"
xshok_pretty_echo_and_log "Next check will be performed in approximately $hours_left hour(s), $minutes_left minute(s)"
fi