From 89ec349ce612284f8d6ce74b837a14b96e61966b Mon Sep 17 00:00:00 2001 From: LukenShiro Date: Wed, 10 Aug 2011 10:46:41 -0300 Subject: network/spamassassin: Updated for version 3.3.2. Signed-off-by: Niels Horn --- network/spamassassin/README | 6 +++--- network/spamassassin/README.SLACKWARE | 11 +++++----- network/spamassassin/doinst.sh | 22 +++++++++---------- network/spamassassin/sa-update.sh | 4 ++-- network/spamassassin/slack-desc | 2 +- network/spamassassin/spamassassin.SlackBuild | 32 +++++++++++----------------- network/spamassassin/spamassassin.info | 8 +++---- 7 files changed, 39 insertions(+), 46 deletions(-) (limited to 'network') diff --git a/network/spamassassin/README b/network/spamassassin/README index f005db8bfb..0d43a47c26 100644 --- a/network/spamassassin/README +++ b/network/spamassassin/README @@ -2,9 +2,9 @@ spamassassin - perl e-mail filter to identify spam Spamassassin is an intelligent email filter which uses a diverse range of tests to identify unsolicited bulk email, more commonly known as Spam. -These tests are applied to email headers and content to classify email using -advanced statistical methods. It has a modular architecture that allows -other technologies to be quickly wielded against spam and is designed for +These tests are applied to email headers and content to classify email using +advanced statistical methods. It has a modular architecture that allows +other technologies to be quickly wielded against spam and is designed for easy integration into virtually any email system. For a complete user experience (basic and advanced functions) spamassassin diff --git a/network/spamassassin/README.SLACKWARE b/network/spamassassin/README.SLACKWARE index 41f93e711a..4c7d61647b 100644 --- a/network/spamassassin/README.SLACKWARE +++ b/network/spamassassin/README.SLACKWARE @@ -1,8 +1,9 @@ -After installation, as spamassassin source does NOT include rules anymore, you -have to run "sa-update" script then restart "/etc/rc.d/rc.spamd", in order to -retrieve updated rules, *BEFORE* using spamassassin or spamc for the first time. -Rules will be installed in a sub-directory of /var/lib/spamassassin// -directory: don't manually move them! +As spamassassin source does NOT include rules anymore, you have to run +"sa-update" script then restart "/etc/rc.d/rc.spamd", in order to retrieve +updated rules, *BEFORE* using spamassassin or spamc for the first time, +after its installation or upgrade. Downloaded rules will be installed in a +sub-directory of /var/lib/spamassassin// directory: don't manually +move them! Upstream developers recommend rules to be kept up-to-date regularly. A really minimal cron script is provided in /etc/cron.weekly/ to dynamically diff --git a/network/spamassassin/doinst.sh b/network/spamassassin/doinst.sh index 0f1a4cd01e..e18d25482e 100644 --- a/network/spamassassin/doinst.sh +++ b/network/spamassassin/doinst.sh @@ -11,22 +11,22 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same permissions on rc.spamd.new as an existing rc.spamd: -if [ -e etc/rc.d/rc.spamd ]; then - cp -a etc/rc.d/rc.spamd etc/rc.d/rc.spamd.new.incoming - cat etc/rc.d/rc.spamd.new > etc/rc.d/rc.spamd.new.incoming - mv etc/rc.d/rc.spamd.new.incoming etc/rc.d/rc.spamd.new -else - # If rc.spamd does not exist, make the new one executable by default, - # which won't matter unless it's called from rc.local anyway - chmod 0755 etc/rc.d/rc.spamd.new -fi +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} +preserve_perms etc/rc.d/rc.spamd.new config etc/mail/spamassassin/init.pre.new config etc/mail/spamassassin/local.cf.new config etc/mail/spamassassin/v310.pre.new config etc/mail/spamassassin/v312.pre.new config etc/mail/spamassassin/v320.pre.new config etc/mail/spamassassin/v330.pre.new -config etc/rc.d/rc.spamd.new config etc/spamassassin.conf.new diff --git a/network/spamassassin/sa-update.sh b/network/spamassassin/sa-update.sh index 519578f9f0..64ab55cca1 100644 --- a/network/spamassassin/sa-update.sh +++ b/network/spamassassin/sa-update.sh @@ -1,7 +1,7 @@ #!/bin/sh -/usr/bin/sa-update > /dev/null +/usr/bin/sa-update > /dev/null 2>&1 if [ $? -eq 0 ]; then - [ -x /etc/rc.d/rc.spamd ] && /etc/rc.d/rc.spamd restart > /dev/null + [ -x /etc/rc.d/rc.spamd ] && /etc/rc.d/rc.spamd restart > /dev/null 2>&1 fi diff --git a/network/spamassassin/slack-desc b/network/spamassassin/slack-desc index fa68158fb2..438222b3c9 100644 --- a/network/spamassassin/slack-desc +++ b/network/spamassassin/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------| + |-----handy-ruler------------------------------------------------------| spamassassin: spamassassin (perl e-mail filter to identify spam) spamassassin: spamassassin: It is an intelligent email filter which uses a diverse range diff --git a/network/spamassassin/spamassassin.SlackBuild b/network/spamassassin/spamassassin.SlackBuild index 6b8c2a311d..072eb69f17 100644 --- a/network/spamassassin/spamassassin.SlackBuild +++ b/network/spamassassin/spamassassin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for spamassassin -# Copyright 2008-2010 LukenShiro +# Copyright 2008-2011 LukenShiro, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,16 +26,14 @@ # spamassassin database, and most of spamassassin dependencies' scripts. PRGNAM=spamassassin -VERSION=${VERSION:-3.3.1} +VERSION=${VERSION:-3.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -72,31 +70,25 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -echo "y" | perl Makefile.PL INSTALLDIRS=vendor +echo "y" | perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG -# Move man-pages to appropriate place -mv $PKG/usr/share/man $PKG/usr/ - -# Remove perlocal.pod, .packlist and .bs from $PKG -( for i in perllocal.pod .packlist *.bs; do - find $PKG -name "$i" -exec rm -rf {} \; - done -) +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true # Remove empty directories -find $PKG -depth -type d -empty -exec rm -rf {} \; +find $PKG -depth -type d -empty -delete || true -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Compress man pages -( cd $PKG/usr/man || exit 1 - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Preserve config files ( cd $PKG/etc/mail/spamassassin diff --git a/network/spamassassin/spamassassin.info b/network/spamassassin/spamassassin.info index 9abba08b1b..1ac20713f9 100644 --- a/network/spamassassin/spamassassin.info +++ b/network/spamassassin/spamassassin.info @@ -1,10 +1,10 @@ PRGNAM="spamassassin" -VERSION="3.3.1" +VERSION="3.3.2" HOMEPAGE="http://spamassassin.apache.org/" -DOWNLOAD="http://www.eu.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.1.tar.bz2" -MD5SUM="bb977900c3b2627db13e9f44f9b5bfc8" +DOWNLOAD="http://www.eu.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2" +MD5SUM="253f8fcbeb6c8bfcab9d139865c1a404" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="LukenShiro" EMAIL="lukenshiro@ngi.it" -APPROVED="michiel" +APPROVED="Niels Horn" -- cgit v1.2.3