From f64823ff4bed529c42fa7bfa22149b25c224b125 Mon Sep 17 00:00:00 2001 From: Nishant Limbachia Date: Tue, 11 May 2010 22:26:33 +0200 Subject: system/clamsmtp: Updated for version 1.10 --- system/clamsmtp/README | 8 +-- system/clamsmtp/clamsmtp.SlackBuild | 99 +++++++++++++++++++++---------------- system/clamsmtp/clamsmtp.info | 8 +-- system/clamsmtp/doinst.sh | 11 ++--- system/clamsmtp/rc.clamsmtpd | 33 +++++++------ system/clamsmtp/slack-desc | 12 +---- 6 files changed, 88 insertions(+), 83 deletions(-) (limited to 'system/clamsmtp') diff --git a/system/clamsmtp/README b/system/clamsmtp/README index a341644856..167492f8db 100644 --- a/system/clamsmtp/README +++ b/system/clamsmtp/README @@ -1,6 +1,6 @@ -ClamSMTP is an SMTP filter that allows you to check for viruses using the -ClamAV anti-virus software. It accepts SMTP connections and forwards the -SMTP commands and responses to another SMTP server. The 'DATA' email body +ClamSMTP is an SMTP filter that allows you to check for viruses using the +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. +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 2fbd9d2e45..87a5589413 100644 --- a/system/clamsmtp/clamsmtp.SlackBuild +++ b/system/clamsmtp/clamsmtp.SlackBuild @@ -1,16 +1,20 @@ #!/bin/sh +################################################################################# + # Slackware Package Build Script for clamsmtp +# Home Page http://memberwebs.com/stef/software/clamsmtp/ + # Copyright (c) 2007, Nishant Limbachia (nishant@mnspace.net) # All rights reserved. # 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, # this list of conditions and the following disclaimer. -# + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -23,76 +27,87 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by Robby Workman for better consistency -# with other scripts in our repository - no new license terms. +################################################################################# PRGNAM=clamsmtp -VERSION=1.9 +VERSION=1.10 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -CWD=$(pwd) + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +CWD=$(pwd) + +set -e if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi -rm -rf $PKG $TMP/$PRGNAM-$VERSION +### clean up from previous builds +rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT + +### Extracting the source tarballs cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $TMP/$PRGNAM-$VERSION + chown -R root.root . + find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +\( -perm 664 -o -perm 666 -o -perm 600 -o -perm 440 -o -perm 444 -o -perm 400 \) \ +-exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --datarootdir=/usr \ - --mandir=/usr/man \ - --program-prefix="" \ - --program-suffix="" \ - --build=$ARCH-slackware-linux \ - || exit 1 - -make || exit 1 -make install DESTDIR=$PKG || exit 1 +find . \ +\( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \ +-exec chmod 755 {} \; +### configure the package +CFLAGS="$SLKCFLAGS" \ +./configure --prefix=/usr \ +--exec-prefix=/usr \ +--sysconfdir=/etc \ +--localstatedir=/var \ +--mandir=/usr/man \ +--datarootdir=/usr \ +--program-prefix="" \ +--program-suffix="" \ +--build=${ARCH}-slackware-linux + +make +make install DESTDIR=$PKG + +### copying essential doc files mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog COPYING INSTALL NEWS \ +README $PKG/usr/doc/$PRGNAM-$VERSION + +### stripping binaries ( cd $PKG - find . | xargs file | grep "executable" | 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 ) -find $PKG/usr/man -name "*.?" -type f 2> /dev/null | xargs gzip -9 2> /dev/null - -if [ -d $PKG/usr/info ]; then - rm -f $PKG/usr/info/dir - find $PKG/usr/info -name "*.info" -type f 2> /dev/null | xargs gzip -9 2> /dev/null -fi +( 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/etc/rc.d +# putting slack-desc and doinst.sh in place +mkdir -p $PKG/install $PKG/etc/rc.d +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/rc.clamsmtpd > $PKG/etc/rc.d/rc.clamsmtpd.new cat $TMP/$PRGNAM-$VERSION/doc/clamsmtpd.conf > $PKG/etc/clamsmtpd.conf.new -mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - +### building package cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/system/clamsmtp/clamsmtp.info b/system/clamsmtp/clamsmtp.info index 9284d6e588..0efc54cb8b 100644 --- a/system/clamsmtp/clamsmtp.info +++ b/system/clamsmtp/clamsmtp.info @@ -1,8 +1,8 @@ PRGNAM="clamsmtp" -VERSION="1.9" +VERSION="1.10" HOMEPAGE="http://memberwebs.com/stef/software/clamsmtp/" -DOWNLOAD="http://memberwebs.com/stef/software/clamsmtp/clamsmtp-1.9.tar.gz" -MD5SUM="cdc7a318e9583f7c3ff925f6ef5f6ae7" +DOWNLOAD="http://memberwebs.com/stef/software/clamsmtp/clamsmtp-1.10.tar.gz" +MD5SUM="b068ba6e444859782bbdd88f290c1abf" MAINTAINER="Nishant Limbachia" EMAIL="nishant@mnspace.net" -APPROVED="rworkman" +APPROVED="David Somero" \ No newline at end of file diff --git a/system/clamsmtp/doinst.sh b/system/clamsmtp/doinst.sh index 5eaefb58b7..f5d8519106 100644 --- a/system/clamsmtp/doinst.sh +++ b/system/clamsmtp/doinst.sh @@ -1,5 +1,3 @@ -#!/bin/sh - config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -13,13 +11,12 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same perms on rc.clamsmtpd.new: -if [ -e etc/rc.d/rc.clamsmtpd ]; then - cp -a etc/rc.d/rc.clamsmtpd etc/rc.d/rc.clamsmtpd.new.incoming +# Keep same perms on rc.heimdal: +if [ -e etc/rc.d/rc.clamsmtpd]; then + cp -a etc/rc.d/rc.clamsmtpdetc/rc.d/rc.clamsmtpd.new.incoming cat etc/rc.d/rc.clamsmtpd.new > etc/rc.d/rc.clamsmtpd.new.incoming mv etc/rc.d/rc.clamsmtpd.new.incoming etc/rc.d/rc.clamsmtpd.new fi -config etc/rc.d/rc.clamsmtpd.new +config etc/rc.d/rc.clamsmtpd.new config etc/clamsmtpd.conf.new - diff --git a/system/clamsmtp/rc.clamsmtpd b/system/clamsmtp/rc.clamsmtpd index 559eee4faf..c6a7e61dc8 100644 --- a/system/clamsmtp/rc.clamsmtpd +++ b/system/clamsmtp/rc.clamsmtpd @@ -4,32 +4,33 @@ # # start/stop/restart clamsmtp mail filter daemon # -# To make clamsmtpd start automatically at boot, make this file executable: -# chmod 0755 /etc/rc.d/rc.clamsmtpd -# To edit the startup options, refer to "man 8 clamsmtpd" +# 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 +# CONFIG="/etc/clamsmtpd.conf" -PIDFILE="/var/run/clamsmtpd.pid" +PIDFILE="/var/run/clamav/clamsmtpd.pid" clamsmtpd_start() { - echo "Starting clamsmtp daemon: /usr/sbin/clamsmtpd " - /usr/sbin/clamsmtpd -f $CONFIG -p $PIDFILE + echo "Starting clamsmtp daemon" + /usr/sbin/clamsmtpd -f $CONFIG -p $PIDFILE } clamsmtpd_stop() { - if [ -f $PIDFILE ]; then - echo "Stopping clamsmtp daemon" - /bin/kill $(cat $PIDFILE) 2>/dev/null - else - echo "clamsmtpd doesn't seem to be running... exiting" - exit 1 - fi + if [ -f $PIDFILE ]; then + echo "Stopping clamsmtp daemon" + /bin/kill $(cat $PIDFILE) 2> /dev/null + else + echo "/usr/sbin/clamsmtpd doesn't seem to be running...exiting" + exit 1 + fi } clamsmtpd_restart() { - clamsmtpd_stop - sleep 2 - clamsmtpd_start + clamsmtpd_stop + sleep 5 + clamsmtpd_start } case "$1" in diff --git a/system/clamsmtp/slack-desc b/system/clamsmtp/slack-desc index d94571cc9f..3be9fb16a9 100644 --- a/system/clamsmtp/slack-desc +++ b/system/clamsmtp/slack-desc @@ -1,12 +1,4 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# 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------------------------------------------------------| -clamsmtp: clamsmt (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 @@ -14,6 +6,6 @@ clamsmtp: and forwards the SMTP commands and responses to another SMTP server. clamsmtp: The 'DATA' email body is intercepted and scanned before forwarding. clamsmtp: clamsmtp: Home Page: http://memberwebs.com/stef/software/clamsmtp -clamsmtp: +clamsmtp: Packaged by Nishant Limbachia clamsmtp: clamsmtp: -- cgit v1.2.3