5 files changed, 40 insertions, 47 deletions
diff --git a/network/clamav-unofficial-sigs/README b/network/clamav-unofficial-sigs/README
index c2a72780d6..1609e93390 100644
--- a/network/clamav-unofficial-sigs/README
+++ b/network/clamav-unofficial-sigs/README
@@ -3,8 +3,8 @@ 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.  Best way to
-update signature is to setup a cron job.  
+It is especially useful when running a mailserver with clamav.  The best way to
+update signatures is to set up a cron job.  
 
 Following four sources of signatures are used by default in the config file:
 
@@ -23,9 +23,10 @@ SecuriteInfo: http://www.securiteinfo.com/services/clamav_unofficial_malwares_si
 MSRBL: http://www.msrbl.com/
 MalwarePatrol: http://www.malware.com.br/
 
-Sample cron entry is included in the package docs, please make appropriate
+A 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
-downloaded using rsync.
+If you are using a firewall on your server, you may have to allow rsync 
+traffic as MSRBL sigs are downloaded using rsync.
+
+This requires clamav.
diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
index d6ee564e5b..d38e1fa88e 100644
--- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
+++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
@@ -1,12 +1,9 @@
 #!/bin/sh
 
 # Slackware Package Build Script for clamav-unofficial-sigs
-# package provides easy download and integration of unofficial third-party
-# clamav signatures.
-
 # Home Page: http://www.inetmsg.com/pub/
 
-# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant@mnspace.net)
+# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +25,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=clamav-unofficial-sigs
-VERSION=3.7
+VERSION=3.7.1
 ARCH=noarch	# hardcode ARCH
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -38,9 +35,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e # Exit on most errors
+set -e
 
-### user and group for config file
 CONFIG_USER="root"
 CONFIG_GROUP="clamav"
 
@@ -49,41 +45,36 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
-mkdir -p $PKG/usr/{bin,doc/$PRGNAM-$VERSION,man/man8}
 
-### install bash script
+mkdir -p $PKG/usr/bin
 install -m 0755 $PRGNAM.sh $PKG/usr/bin
 
-### 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
+mkdir -p $PKG/etc/logrotate.d
+install -m 0644 $PRGNAM-logrotate $PKG/etc/logrotate.d/$PRGNAM.new
 
-### install logrotate script
-install -D -m 0644 $PRGNAM-logrotate $PKG/etc/logrotate.d/$PRGNAM.new
-
-### install manpage and compress manpage
+mkdir -p $PKG/usr/man/man8
 install -m 0644 $PRGNAM.8 $PKG/usr/man/man8
 gzip -9 $PKG/usr/man/man8/$PRGNAM.8
 
-### 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 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 its files) via the "-r" flag
 patch -p0 < $CWD/package_manager.patch
+mkdir -p $PKG/etc
 install -m 0640 $PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
+chown $CONFIG_USER:$CONFIG_GROUP $PKG/etc/$PRGNAM.conf.new
+
+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
 
-### install doinst.sh and slack-desc
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
-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
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
-### make package
 cd $PKG
 /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 3dbdd13b16..2e1895f23b 100644
--- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info
+++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info
@@ -1,10 +1,10 @@
 PRGNAM="clamav-unofficial-sigs"
-VERSION="3.7"
+VERSION="3.7.1"
 HOMEPAGE="http://www.inetmsg.com/pub/"
-DOWNLOAD="http://www.inetmsg.com/pub/clamav-unofficial-sigs-3.7.tar.gz"
-MD5SUM="86f319c5806e6ca76d4de47e6a49a710"
+DOWNLOAD="http://www.inetmsg.com/pub/clamav-unofficial-sigs-3.7.1.tar.gz"
+MD5SUM="c00f38cd0ff51672e3cbb638aec8d124"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/network/clamav-unofficial-sigs/doinst.sh b/network/clamav-unofficial-sigs/doinst.sh
index 834a21280f..a7c044824b 100644
--- a/network/clamav-unofficial-sigs/doinst.sh
+++ b/network/clamav-unofficial-sigs/doinst.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -14,3 +13,4 @@ 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 8b22a330fe..0625ebb26a 100644
--- a/network/clamav-unofficial-sigs/slack-desc
+++ b/network/clamav-unofficial-sigs/slack-desc
@@ -4,15 +4,16 @@
 # 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------------------------------------------------------|
 clamav-unofficial-sigs: clamav-unofficial-sigs (unofficial clamav signatures)
 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: This package provides Bill Landry's unofficial clamav signatures.
+clamav-unofficial-sigs:
+clamav-unofficial-sigs: It downloads phish, scam, junk, malware and other third-party
+clamav-unofficial-sigs: databases to integrate with clamav.  It primarily needs to run
+clamav-unofficial-sigs: via cron.  Please see INSTALL file in the package docs for 
+clamav-unofficial-sigs: information on cron and config file setup. 
 clamav-unofficial-sigs:
 clamav-unofficial-sigs: http://www.inetmsg.com/pub/
+clamav-unofficial-sigs: