summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishant Limbachia <nishant@mnspace.net>2010-04-24 04:08:46 -0500
committerErik Hanson <erik@slackbuilds.org>2010-05-15 10:50:25 +0200
commit04934ef77f7d2b32ff68d26b3741b6941f0e64e8 (patch)
tree5a8d260db0ddd0b5166e47fa9872f837e922a17a
parentbdf0c4ab734020a12712150c12714bd62d9edecc (diff)
downloadslackbuilds-04934ef77f7d2b32ff68d26b3741b6941f0e64e8.tar.gz
system/clamsmtp: Build bump, script cleanup.
-rw-r--r--system/clamsmtp/README2
-rw-r--r--system/clamsmtp/clamsmtp.SlackBuild27
-rw-r--r--system/clamsmtp/clamsmtp.info2
-rw-r--r--system/clamsmtp/doinst.sh3
-rw-r--r--system/clamsmtp/rc.clamsmtpd14
-rw-r--r--system/clamsmtp/slack-desc6
6 files changed, 25 insertions, 29 deletions
diff --git a/system/clamsmtp/README b/system/clamsmtp/README
index b6579844c2..167492f8db 100644
--- a/system/clamsmtp/README
+++ b/system/clamsmtp/README
@@ -3,4 +3,4 @@ ClamAV anti-virus software. It accepts SMTP connections and forwards the
SMTP commands and responses to another SMTP server. The 'DATA' email body
is intercepted and scanned before forwarding.
-This requires clamav.
+ClamAV (available at SlackBuilds.org) is required for this package. \ No newline at end of file
diff --git a/system/clamsmtp/clamsmtp.SlackBuild b/system/clamsmtp/clamsmtp.SlackBuild
index 86083aff0b..97bf9657ec 100644
--- a/system/clamsmtp/clamsmtp.SlackBuild
+++ b/system/clamsmtp/clamsmtp.SlackBuild
@@ -1,14 +1,15 @@
#!/bin/sh
# Slackware Package Build Script for clamsmtp
+# Home Page http://memberwebs.com/stef/software/clamsmtp/
-# Copyright (c) 2008-2009, Nishant Limbachia (nishant@mnspace.net)
+# Copyright (c) 2008-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
+# 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
@@ -26,7 +27,7 @@
PRGNAM=clamsmtp
VERSION=1.10
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
TMP=${TMP:-/tmp/SBo}
@@ -50,7 +51,7 @@ set -e
rm -fr $TMP/$PRGNAM-$VERSION $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $TMP/$PRGNAM-$VERSION
chown -R root.root .
find . \
@@ -63,12 +64,12 @@ find . \
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
--exec-prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
- --datarootdir=/usr \
+ --infodir=/usr/info \
--build=${ARCH}-slackware-linux
make
@@ -77,20 +78,16 @@ make install DESTDIR=$PKG
# Install init script and config file
mkdir -p $PKG/etc/rc.d
cat $CWD/rc.clamsmtpd > $PKG/etc/rc.d/rc.clamsmtpd.new
-chmod 0755 $PKG/etc/rc.d/rc.clamsmtpd.new
cat doc/clamsmtpd.conf > $PKG/etc/clamsmtpd.conf.new
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
-)
+### strip binaries
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
( cd $PKG/usr/man
find . -type f -exec gzip -9 {} \;
for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README \
diff --git a/system/clamsmtp/clamsmtp.info b/system/clamsmtp/clamsmtp.info
index 3aae91b729..cc1e97f914 100644
--- a/system/clamsmtp/clamsmtp.info
+++ b/system/clamsmtp/clamsmtp.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Nishant Limbachia"
EMAIL="nishant@mnspace.net"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
diff --git a/system/clamsmtp/doinst.sh b/system/clamsmtp/doinst.sh
index 24c2011cf8..4f31733f91 100644
--- a/system/clamsmtp/doinst.sh
+++ b/system/clamsmtp/doinst.sh
@@ -19,5 +19,4 @@ if [ -e etc/rc.d/rc.clamsmtpd ]; then
fi
config etc/rc.d/rc.clamsmtpd.new
-config etc/clamsmtpd.conf.new
-
+config etc/clamsmtpd.conf.new \ No newline at end of file
diff --git a/system/clamsmtp/rc.clamsmtpd b/system/clamsmtp/rc.clamsmtpd
index b4ec58edf9..e71651d104 100644
--- a/system/clamsmtp/rc.clamsmtpd
+++ b/system/clamsmtp/rc.clamsmtpd
@@ -1,14 +1,14 @@
#!/bin/sh
+# Copyright (c) 2008-2010, Nishant Limbachia, Hoffman Estates, IL, USA
# /etc/rc.d/rc.clamsmtpd
-# Start/stop/restart clamsmtp mail filter daemon
+# start/stop/restart clamsmtp mail filter daemon
+
+# To make clamsmtp start automatically at boot, make this
+# file executable: chmod 755 /etc/rc.d/rc.clamsmtpd
+# to edit the startup options refer man 8 clamsmtpd
-# To make ntpd start automatically at boot, make this file executable:
-# chmod 755 /etc/rc.d/rc.clamsmtpd
-# and be sure it's called from somewhere (e.g. rc.local)
-#
-# To edit the startup options refer man 8 clamsmtpd
CONFIG="/etc/clamsmtpd.conf"
PIDFILE="/var/run/clamav/clamsmtpd.pid"
@@ -25,7 +25,7 @@ clamsmtpd_start() {
clamsmtpd_stop() {
if [ -f $PIDFILE ]; then
echo "Stopping clamsmtp daemon"
- /bin/kill $(cat $PIDFILE) 2> /dev/null
+ kill -s 15 $(cat $PIDFILE) 2> /dev/null
else
echo "/usr/sbin/clamsmtpd doesn't seem to be running...exiting"
exit 1
diff --git a/system/clamsmtp/slack-desc b/system/clamsmtp/slack-desc
index 1d4fe39741..01f03c4311 100644
--- a/system/clamsmtp/slack-desc
+++ b/system/clamsmtp/slack-desc
@@ -6,10 +6,10 @@
# customary to leave one space after the ':'.
|-----handy-ruler-----------------------------------------------------|
-clamsmtp: ClamSMTP (ClamAV SMTP filter)
+clamsmtp: clamsmtp (ClamAV SMTP filter)
clamsmtp:
-clamsmtp: ClamSMTP is an SMTP filter that allows you to check for viruses
-clamsmtp: using the ClamAV anti-virus software. It accepts SMTP connections
+clamsmtp: clamsmtp is an SMTP filter that allows you to check for viruses
+clamsmtp: using the ClamAV anti-virus software. It accepts SMTP connections
clamsmtp: and forwards the SMTP commands and responses to another SMTP server.
clamsmtp: The 'DATA' email body is intercepted and scanned before forwarding.
clamsmtp: