aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/clamsmtp/README2
-rw-r--r--system/clamsmtp/clamsmtp.SlackBuild16
-rw-r--r--system/clamsmtp/clamsmtp.info2
-rw-r--r--system/clamsmtp/doinst.sh3
-rw-r--r--system/clamsmtp/rc.clamsmtpd15
5 files changed, 23 insertions, 15 deletions
diff --git a/system/clamsmtp/README b/system/clamsmtp/README
index 167492f8dbebd..b6579844c2c25 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.
-ClamAV (available at SlackBuilds.org) is required for this package. \ No newline at end of file
+This requires clamav.
diff --git a/system/clamsmtp/clamsmtp.SlackBuild b/system/clamsmtp/clamsmtp.SlackBuild
index 7ccdf0b9ee74f..86083aff0b3d8 100644
--- a/system/clamsmtp/clamsmtp.SlackBuild
+++ b/system/clamsmtp/clamsmtp.SlackBuild
@@ -1,7 +1,6 @@
#!/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)
# All rights reserved.
@@ -37,10 +36,13 @@ CWD=$(pwd)
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -61,13 +63,12 @@ find . \
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--exec-prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--datarootdir=/usr \
- --program-prefix="" \
- --program-suffix="" \
--build=${ARCH}-slackware-linux
make
@@ -76,11 +77,14 @@ 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
+ 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
)
( cd $PKG/usr/man
@@ -97,4 +101,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
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/system/clamsmtp/clamsmtp.info b/system/clamsmtp/clamsmtp.info
index 70bca3b672add..3aae91b7291ae 100644
--- a/system/clamsmtp/clamsmtp.info
+++ b/system/clamsmtp/clamsmtp.info
@@ -3,6 +3,8 @@ VERSION="1.10"
HOMEPAGE="http://memberwebs.com/stef/software/clamsmtp/"
DOWNLOAD="http://memberwebs.com/stef/software/clamsmtp/clamsmtp-1.10.tar.gz"
MD5SUM="b068ba6e444859782bbdd88f290c1abf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Nishant Limbachia"
EMAIL="nishant@mnspace.net"
APPROVED="rworkman"
diff --git a/system/clamsmtp/doinst.sh b/system/clamsmtp/doinst.sh
index 4f31733f91b00..24c2011cf8174 100644
--- a/system/clamsmtp/doinst.sh
+++ b/system/clamsmtp/doinst.sh
@@ -19,4 +19,5 @@ if [ -e etc/rc.d/rc.clamsmtpd ]; then
fi
config etc/rc.d/rc.clamsmtpd.new
-config etc/clamsmtpd.conf.new \ No newline at end of file
+config etc/clamsmtpd.conf.new
+
diff --git a/system/clamsmtp/rc.clamsmtpd b/system/clamsmtp/rc.clamsmtpd
index d561a8d17385f..b4ec58edf9d57 100644
--- a/system/clamsmtp/rc.clamsmtpd
+++ b/system/clamsmtp/rc.clamsmtpd
@@ -1,13 +1,14 @@
#!/bin/sh
-#
+
# /etc/rc.d/rc.clamsmtpd
+
+# Start/stop/restart clamsmtp mail filter daemon
+
+# 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)
#
-# start/stop/restart clamsmtp mail filter daemon
-#
-# To make ntpd 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 edit the startup options refer man 8 clamsmtpd
CONFIG="/etc/clamsmtpd.conf"
PIDFILE="/var/run/clamav/clamsmtpd.pid"