5 files changed, 64 insertions, 60 deletions
diff --git a/network/clamav-unofficial-sigs/README b/network/clamav-unofficial-sigs/README
index e7a7acc76e..c2a72780d6 100644
--- a/network/clamav-unofficial-sigs/README
+++ b/network/clamav-unofficial-sigs/README
@@ -1,29 +1,31 @@
-clamav-unofficial-sigs provides a shell script to download, verify (GPG)
-and integrate third-party clamav signatures into the clamav database.  
-These third-party signatures provide valuable spam and malware detection 
+clamav-unofficial-sigs provides a shell script to download, verify (GPG) and
+integrate third-party clamav signatures into the clamav database.  These
+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 probably to setup a cron job to do so.
 
-The following four sources of signatures are used by default:
+It is especially useful when running a mailserver with clamav.  Best way to
+update signature is to setup a cron job.  
+
+Following four sources of signatures are used by default in the config file:
+
 1) SaneSecurity
 2) MSRBL (Realtime Blacklists)
 3) SecuriteInfo
 4) MalwarePatrol
 
-These sources are fully tweakable via the config file.  Also refer to the 
-documentation included with the package which provides configuration and 
+These sources are fully tweakable via the config file.  Also refer to the
+documentation included with the package which provides configuration and
 setup infomation.
 
-The following are the URLs for each signature source:
+Following are the URLs for each signature source.
 SaneSecurity: http://www.sanesecurity.com/index.htm
 SecuriteInfo: http://www.securiteinfo.com/services/clamav_unofficial_malwares_signatures.shtml
 MSRBL: http://www.msrbl.com/
 MalwarePatrol: http://www.malware.com.br/
 
-A sample cron entry is included in the package docs; please make appropriate 
+Sample cron entry is included in the package docs, please make appropriate
 changes to it and add it to root's crontab.
 
-You must have clamav installed to run this.  Also, if you are using a firewall 
-on your server, you may have to allow rsync traffic, as MSRBL sigs are 
+You must have clamav installed to run this.  Also if you are using a firewall
+on your server, you may have to allow rsync traffic as MSRBL sigs are
 downloaded using rsync.
diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
index 1a79eebba2..d6ee564e5b 100644
--- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
+++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
@@ -1,19 +1,18 @@
 #!/bin/sh
 
 # Slackware Package Build Script for clamav-unofficial-sigs
-
 # package provides easy download and integration of unofficial third-party
 # clamav signatures.
 
-# http://www.inetmsg.com/pub/
+# Home Page: http://www.inetmsg.com/pub/
 
-# Copyright (c) 2009, Nishant Limbachia (nishant@mnspace.net)
+# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant@mnspace.net)
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is 
+# Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
-# 1. Redistributions of script must retain the above copyright notice, 
+# 1. Redistributions of script must retain the above copyright notice,
 #    this list of conditions and the following disclaimer.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -29,8 +28,8 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=clamav-unofficial-sigs
-VERSION=3.1
-ARCH=${ARCH:-noarch}
+VERSION=3.7
+ARCH=noarch	# hardcode ARCH
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,48 +40,50 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e # Exit on most errors
 
-# user and group for config file
-# If you set up clamav to use a different group, you can change it here,
-# but you will also need to edit the config file that this package installs
-CONFIG_USER=root
-CONFIG_GROUP=clamav
+### user and group for config file
+CONFIG_USER="root"
+CONFIG_GROUP="clamav"
 
 rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-chown -R root.root .
 
-# Install bash script
-mkdir -p $PKG/usr/bin
+chown -R root:root .
+mkdir -p $PKG/usr/{bin,doc/$PRGNAM-$VERSION,man/man8}
+
+### install bash script
 install -m 0755 $PRGNAM.sh $PKG/usr/bin
 
-# Install logrotate script
-install -D -m 0644 $PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new
+### install docs
+install -m 0644 CHANGELOG INSTALL README \
+LICENSE clamd-status.sh \
+$PRGNAM-cron $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Patch and provide config file in /etc
-# The patch actually introduces two variables pkg_mgr & pkg_rm.
-# These variables are original developer's recommended way to stop
-# the script from removing itself (and it's files) via the "-r" flag
-patch -p0 < $CWD/package_manager.patch
-install -m 0640 $PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
-chown $CONFIG_USER:$CONFIG_GROUP $PKG/etc/$PRGNAM.conf.new
+### install logrotate script
+install -D -m 0644 $PRGNAM-logrotate $PKG/etc/logrotate.d/$PRGNAM.new
 
-# Install and compress manpage
-mkdir -p $PKG/usr/man/man8
+### install manpage and compress manpage
 install -m 0644 $PRGNAM.8 $PKG/usr/man/man8
 gzip -9 $PKG/usr/man/man8/$PRGNAM.8
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
-cp -a \
-  CHANGELOG INSTALL README LICENSE clamd-status.sh $PRGNAM.cron \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+### patch and provide config file in /etc
+### patch actually introduces two variables pkg_mgr & pkg_rm.
+### these variables are original developer's recommended way to stop
+### the script from removing itself (and its files) via the "-r" flag
+patch -p0 < $CWD/package_manager.patch
+install -m 0640 $PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
 
+### install doinst.sh and slack-desc
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
-sed "s%@VERSION@%$VERSION%g" $CWD/slack-desc > $PKG/install/slack-desc
+sed s:@VERSION@:$PRGNAM-$VERSION: $CWD/slack-desc > $PKG/install/slack-desc
+
+### change config file perms
+chown $CONFIG_USER:$CONFIG_GROUP $PKG/etc/$PRGNAM.conf.new
 
+### make package
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info
index 227da05557..3dbdd13b16 100644
--- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info
+++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info
@@ -1,8 +1,10 @@
 PRGNAM="clamav-unofficial-sigs"
-VERSION="3.1"
+VERSION="3.7"
 HOMEPAGE="http://www.inetmsg.com/pub/"
-DOWNLOAD="http://www.inetmsg.com/pub/clamav-unofficial-sigs-3.1.tar.gz"
-MD5SUM="730c25252a485164df49452dac8e970c"
+DOWNLOAD="http://www.inetmsg.com/pub/clamav-unofficial-sigs-3.7.tar.gz"
+MD5SUM="86f319c5806e6ca76d4de47e6a49a710"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
diff --git a/network/clamav-unofficial-sigs/doinst.sh b/network/clamav-unofficial-sigs/doinst.sh
index a7c044824b..834a21280f 100644
--- a/network/clamav-unofficial-sigs/doinst.sh
+++ b/network/clamav-unofficial-sigs/doinst.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -13,4 +14,3 @@ config() {
 
 config etc/clamav-unofficial-sigs.conf.new
 config etc/logrotate.d/clamav-unofficial-sigs.new
-
diff --git a/network/clamav-unofficial-sigs/slack-desc b/network/clamav-unofficial-sigs/slack-desc
index b9cac3ea64..8b22a330fe 100644
--- a/network/clamav-unofficial-sigs/slack-desc
+++ b/network/clamav-unofficial-sigs/slack-desc
@@ -4,16 +4,15 @@
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
-
-                      |-----handy-ruler-------------------------------------------------------|
+                      |-----handy-ruler------------------------------------------------------|
 clamav-unofficial-sigs: clamav-unofficial-sigs (unofficial clamav signatures)
 clamav-unofficial-sigs:
-clamav-unofficial-sigs: This provides Bill Landry's unofficial clamav signatures bash script.
-clamav-unofficial-sigs: The actual script downloads phish, scam, junk, malware, and other 
-clamav-unofficial-sigs: third-party databases to integrate with clamav.  The script 
-clamav-unofficial-sigs: primarily needs to run via cron.  Please see the INSTALL file in
-clamav-unofficial-sigs: /usr/doc/clamav-unofficial-sigs-@VERSION@ for info on cron and
-clamav-unofficial-sigs: configuration file setup, and also refer to the README in
-clamav-unofficial-sigs: /usr/doc/clamav-unofficial-sigs-@VERSION@ for features.
-clamav-unofficial-sigs:
+clamav-unofficial-sigs: Provides Bill Landry's unofficial clamav signatures bash script.
+clamav-unofficial-sigs: Actual script downloads phish, scam, junk, malware and other third-
+clamav-unofficial-sigs: party databases to integrate with clamav. Script primarily needs to
+clamav-unofficial-sigs: run via cron.  Please see INSTALL file in
+clamav-unofficial-sigs: /usr/doc/@VERSION@ for info
+clamav-unofficial-sigs: on cron and config file setup.  Refer to README in
+clamav-unofficial-sigs: /usr/doc/@VERSION@ for features.
 clamav-unofficial-sigs:
+clamav-unofficial-sigs: http://www.inetmsg.com/pub/