diff options
9 files changed, 65 insertions, 69 deletions
diff --git a/network/clamav-unofficial-sigs/README b/network/clamav-unofficial-sigs/README index 936738ebb7..fa9e4a50a9 100644 --- a/network/clamav-unofficial-sigs/README +++ b/network/clamav-unofficial-sigs/README @@ -4,7 +4,7 @@ third-party signatures provide valuable spam and malware detection capabilities and make an excellent enhancement to native clamav signatures. It is especially useful when running a mailserver with clamav. The best way to -update signatures is to set up a cron job. +update signatures is to set up a cron job. These sources are fully tweakable via the config file. Also refer to the documentation included with the package which provides configuration and diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.8 b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.8 index 24bd576e5b..64c9e29ac5 100644 --- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.8 +++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.8 @@ -1,6 +1,6 @@ .\" Manual page for eXtremeSHOK.com ClamAV Unofficial Signature Updater -.TH clamav-unofficial-sigs 8 "18 April 2016" "Version: 5.2.2" "SCRIPT COMMANDS" +.TH clamav-unofficial-sigs 8 "2017-03-19" "Version: 5.6.2" "SCRIPT COMMANDS" .SH NAME clamav-unofficial-sigs \- Download, test, and install third-party ClamAV signature databases. .SH SYNOPSIS @@ -16,47 +16,47 @@ This script follows the standard GNU command line syntax. \fB Usage: clamav\-unofficial\-sigs.sh \fR [OPTION] [PATH|FILE] .TP \fB \-c, \-\-config \fR Use a specific configuration file or directory eg: '\-c /your/dir' or ' \-c /your/file.name' Note: If a directory is specified the directory must contain atleast: master.conf, os.conf or user.conf Default Directory: /etc/clamav\-unofficial\-sigs -.TP +.TP \fB \-F, \-\-force \fR Force all databases to be downloaded, could cause ip to be blocked -.TP +.TP \fB \-h, \-\-help \fR Display this script's help and usage information -.TP +.TP \fB \-V, \-\-version \fR Output script version and date information -.TP +.TP \fB \-v, \-\-verbose \fR Be verbose, enabled when not run under cron -.TP +.TP \fB \-s, \-\-silence \fR Only output error messages, enabled when run under cron -.TP +.TP \fB \-d, \-\-decode\-sig \fR Decode a third\-party signature either by signature name (eg: Sanesecurity.Junk.15248) or hexadecimal string. This flag will 'NOT' decode image signatures -.TP +.TP \fB \-e, \-\-encode\-string \fR Hexadecimal encode an entire input string that can be used in any '*.ndb' signature database file -.TP +.TP \fB \-f, \-\-encode\-formatted \fR Hexadecimal encode a formatted input string containing signature spacing fields '{}, (), *', without encoding the spacing fields, so that the encoded signature can be used in any '*.ndb' signature database file -.TP +.TP \fB \-g, \-\-gpg\-verify \fR GPG verify a specific Sanesecurity database file eg: '\-g filename.ext' (do not include file path) -.TP +.TP \fB \-i, \-\-information \fR Output system and configuration information for viewing or possible debugging purposes -.TP +.TP \fB \-m, \-\-make\-database \fR Make a signature database from an ascii file containing data strings, with one data string per line. Additional information is provided when using this flag -.TP -\fB \-t, \-\-test\-database \fR Clamscan integrity test a specific database file eg: '\-s filename.ext' (do not include file path) -.TP +.TP +\fB \-t, \-\-test\-database \fR Clamscan integrity test a specific database file eg: '\-t filename.ext' (do not include file path) +.TP \fB \-o, \-\-output\-triggered \fR If HAM directory scanning is enabled in the script's configuration file, then output names of any third\-party signatures that triggered during the HAM directory scan -.TP +.TP \fB \-w, \-\-whitelist \fR Adds a signature whitelist entry in the newer ClamAV IGN2 format to 'my\-whitelist.ign2' in order to temporarily resolve a false\-positive issue with a specific third\-party signature. Script added whitelist entries will automatically be removed if the original signature is either modified or removed from the third\-party signature database -.TP +.TP \fB \-\-check\-clamav \fR If ClamD status check is enabled and the socket path is correctly specifiedthen test to see if clamd is running or not -.TP +.TP \fB \-\-install\-all \fR Install and generate the cron, logroate and man files, autodetects the values based on your config files .TP \fB \-\-install\-cron \fR Install and generate the cron file, autodetects the values based on your config files -.TP +.TP \fB \-\-install\-logrotate \fR Install and generate the logrotate file, autodetects the values based on your config files -.TP +.TP \fB \-\-install\-man \fR Install and generate the man file, autodetects the values based on your config files -.TP +.TP \fB \-\-remove\-script \fR Remove the clamav\-unofficial\-sigs script and all of its associated files and databases from the system -.TP +.TP .SH SEE ALSO .BR clamd (8), .BR clamscan (1) diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild index 906fe1b175..ffcde237c2 100644 --- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild +++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild @@ -3,7 +3,7 @@ # Slackware Package Build Script for clamav-unofficial-sigs # Home Page: https://github.com/extremeshok/clamav-unofficial-sigs -# Copyright (c) 2009-2016, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2009-2017, Nishant Limbachia, Hoffman Estates, IL, USA # (nishant _AT_ mnspace _DOT_ net) # All rights reserved. # @@ -26,7 +26,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM="clamav-unofficial-sigs" -VERSION=${VERSION:-5.4.1} +VERSION=${VERSION:-5.6.2} ARCH="noarch" # hardcode ARCH BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,8 +53,8 @@ chown -R root:root . # Apply patches, copy configs mkdir -p $PKG/etc/{$PRGNAM,logrotate.d} -patch -p0 < $CWD/patches/os.slackware.conf.patch -patch -p0 < $CWD/patches/master.conf.patch +( cd config; patch -p0 < $CWD/patches/os.slackware.conf.patch ) +( cd config; patch -p0 < $CWD/patches/master.conf.patch ) install -m 0644 -D config/user.conf $PKG/etc/$PRGNAM/user.conf.new install -m 0644 -D config/os.slackware.conf $PKG/etc/$PRGNAM/os.conf.new install -m 0644 -D config/master.conf $PKG/etc/$PRGNAM/master.conf.new diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.cron b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.cron index f59068b3e9..dc876080b1 100644 --- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.cron +++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.cron @@ -7,26 +7,26 @@ ################## # # Script updates can be found at: https://github.com/extremeshok/clamav-unofficial-sigs -# -# Originially based on: +# +# Originially based on: # Script provide by Bill Landry (unofficialsigs@gmail.com). # # License: BSD (Berkeley Software Distribution) # ################## -# Automatically Generated: Sun May 8 10:25:59 CDT 2016 +# Automatically Generated: Mon Mar 27 19:57:03 CDT 2017 ################## # # This cron file will execute the clamav-unofficial-sigs.sh script that # currently supports updating third-party signature databases provided # by Sanesecurity, SecuriteInfo, MalwarePatrol, OITC, etc. # -# The script is set to run hourly, at a random minute past the hour, and the +# The script is set to run hourly, at a random minute past the hour, and the # script itself is set to randomize the actual execution time between # 60 - 600 seconds. To Adjust the cron values, edit your configs and run # bash clamav-unofficial-sigs.sh --install-cron to generate a new file. -6 * * * * clamav /usr/bin/bash /usr/bin/clamav-unofficial-sigs.sh > /dev/null +27 * * * * clamav [ -x /usr/bin/clamav-unofficial-sigs.sh ] && /usr/bin/bash /usr/bin/clamav-unofficial-sigs.sh > /dev/null # https://eXtremeSHOK.com ###################################################### diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info index 4f948be2fd..8d51786e15 100644 --- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info +++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info @@ -1,8 +1,8 @@ PRGNAM="clamav-unofficial-sigs" -VERSION="5.4.1" +VERSION="5.6.2" HOMEPAGE="https://github.com/extremeshok/clamav-unofficial-sigs" -DOWNLOAD="https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.4.1.tar.gz" -MD5SUM="751ad669a07a40db0e6b477648fe494e" +DOWNLOAD="https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.6.2.tar.gz" +MD5SUM="f3226e88cc84de5803c84583cf72e622" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="clamav" diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.logrotate b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.logrotate index 0b4cebc9e6..dafb4ab16d 100644 --- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.logrotate +++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.logrotate @@ -7,14 +7,14 @@ ################## # # Script updates can be found at: https://github.com/extremeshok/clamav-unofficial-sigs -# -# Originially based on: +# +# Originially based on: # Script provide by Bill Landry (unofficialsigs@gmail.com). # # License: BSD (Berkeley Software Distribution) # ################## -# Automatically Generated: $(date) +# Automatically Generated: Mon Mar 27 20:00:05 CDT 2017 ################## # # This logrotate file will rotate the logs generated by the clamav-unofficial-sigs.sh @@ -22,11 +22,12 @@ # To Adjust the logrotate values, edit your configs and run # bash clamav-unofficial-sigs.sh --install-logrotate to generate a new file. -/var/log/clamav/clamav-unofficial-sigs.log { +/var/log/clamav-unofficial-sigs/clamav-unofficial-sigs.log { weekly rotate 4 missingok notifempty compress - create 0644 clamav clamav -}
\ No newline at end of file + create 0640 clamav clamav +} + diff --git a/network/clamav-unofficial-sigs/package_manager.patch b/network/clamav-unofficial-sigs/package_manager.patch deleted file mode 100644 index 0b34520922..0000000000 --- a/network/clamav-unofficial-sigs/package_manager.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- clamav-unofficial-sigs.conf.orig 2013-09-16 18:58:03.738768005 -0500 -+++ clamav-unofficial-sigs.conf 2013-09-16 18:59:41.609098853 -0500 -@@ -31,6 +31,10 @@ - PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" - export PATH - -+# Slackware Package Management Variables -+pkg_mgr="pkgtool" -+pkg_rm="removepkg clamav-unofficial-sigs" -+ - # Set the appropriate ClamD user and group accounts for your system. - # If you do not want the script to set user and group permissions on - # files and directories, comment the next two variables. diff --git a/network/clamav-unofficial-sigs/patches/master.conf.patch b/network/clamav-unofficial-sigs/patches/master.conf.patch index 6491f8da17..204d7a9e1b 100644 --- a/network/clamav-unofficial-sigs/patches/master.conf.patch +++ b/network/clamav-unofficial-sigs/patches/master.conf.patch @@ -1,6 +1,6 @@ ---- config/master.conf.orig 2016-05-08 14:29:36.954240236 -0500 -+++ config/master.conf 2016-05-08 14:33:04.116828055 -0500 -@@ -24,8 +24,8 @@ +--- master.conf.orig 2017-03-27 19:19:44.055587408 -0500 ++++ master.conf 2017-03-27 19:31:13.690746220 -0500 +@@ -26,8 +26,8 @@ # Set the appropriate ClamD user and group accounts for your system. # If you do not want the script to set user and group permissions on # files and directories, comment the next two variables. @@ -11,8 +11,17 @@ # If you do not want the script to change the file mode of all signature # database files in the ClamAV working directory to 0644 (-rw-r--r--): -@@ -55,7 +55,7 @@ - reload_dbs="yes" +@@ -50,7 +50,7 @@ + # To enable "ham" (non-spam) directory scanning and removal of + # signatures that trigger on ham messages, uncomment the following + # variable and set it to the appropriate ham message directory. +-#ham_dir="/var/lib/clamav-unofficial-sigs/ham-test" ++ham_dir="/var/lib/clamav/clamav-unofficial-sigs/ham-test" + + # If you would like to reload the clamd databases after an update, + # change the following variable to "yes". +@@ -60,7 +60,7 @@ + clamd_reload_opt="clamdscan --reload" # Top level working directory, script will attempt to create them. -work_dir="/var/lib/clamav-unofficial-sigs" #Top level working directory @@ -20,16 +29,16 @@ # Log update information to '$log_file_path/$log_file_name'. logging_enabled="yes" -@@ -357,7 +357,7 @@ +@@ -397,7 +397,7 @@ max_sleep_time="600" # Default maximum is 600 seconds (10 minutes). # Command to do a full clamd service stop/start -#clamd_restart_opt="service clamd restart" +clamd_restart_opt="/etc/rc.d/rc.clamav restart" - # Custom Command to fo a full clamd reload, this defaults to "clamdscan --reload" when not set - #clamd_reload_opt="clamdscan --reload" -@@ -459,15 +459,15 @@ + # Custom Command Paths, these are detected with the which command when not set + #uname_bin="/usr/bin/uname" +@@ -501,15 +501,15 @@ # Custom man install settings, these are detected and only used if you want to override # the automatic detection and generation of the values when not set, this is mainly to aid package maintainers @@ -38,9 +47,9 @@ +man_dir="/usr/man/man8" #default: /usr/share/man/man8 +man_filename="clamav-unofficial-sigs.8" #default: clamav-unofficial-sigs.8 - # Provided two variables that package and port maintainers can use in order to + # Provided two variables that package and port maintainers can use in order to # prevent the script from removing itself with the '-r' flag - # If the script was installed via a package manager like yum, apt, pkg, etc. + # If the script was installed via a package manager like yum, apt, pkg, etc. # The script will instead provide feedback to the user about how to uninstall the package. -#pkg_mgr="" #the package manager name -#pkg_rm="" #the package manager command to remove the script diff --git a/network/clamav-unofficial-sigs/patches/os.slackware.conf.patch b/network/clamav-unofficial-sigs/patches/os.slackware.conf.patch index 94e58b6ace..62d2788a68 100644 --- a/network/clamav-unofficial-sigs/patches/os.slackware.conf.patch +++ b/network/clamav-unofficial-sigs/patches/os.slackware.conf.patch @@ -1,13 +1,12 @@ ---- config/os.slackware.conf.orig 2016-05-03 21:29:02.518557766 -0500 -+++ config/os.slackware.conf 2016-05-03 21:31:20.083647753 -0500 -@@ -27,13 +27,13 @@ +--- os.slackware.conf.orig 2017-03-27 19:20:18.394890692 -0500 ++++ os.slackware.conf 2017-03-27 19:33:55.428193026 -0500 +@@ -23,13 +23,12 @@ clam_user="clamav" clam_group="clamav" -#clam_dbs="/var/lib/clamav" -clam_dbs="/usr/local/share/clamav" +clam_dbs="/var/lib/clamav" -+#clam_dbs="/usr/local/share/clamav" clamd_pid="/var/run/clamav/clamd.pid" |