X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Fspamassassin;h=b32888aa232ed07427b22ef371465d7d67aa83a6;hb=3a7d016a0246156de63a6f98bbf5be2e95230060;hp=b833c0e2b05331f415c3fc9a58a8f4c9ee3acd1d;hpb=3dae4c554ec18f465eb6ee5e6efdbdbe8557e13c;p=hvlinux.git

diff --git a/stage5/pkg/spamassassin b/stage5/pkg/spamassassin
index b833c0e..b32888a 100644
--- a/stage5/pkg/spamassassin
+++ b/stage5/pkg/spamassassin
@@ -1,26 +1,16 @@
-#!/bin/sh
-set -o errexit
+#!/bin/bash
 
-# First argument of this script is the package name
+hvconfig_pre()
+{
+    export CONTACT_ADDRESS="postmaster"
+    export ENABLE_SSL="no"
+    export RUN_NET_TESTS="no"
+}
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1}
-
-cd ${LFS_TMP}/${1}
-perl Makefile.PL -n \
-    CONTACT_ADDRESS="postmaster" \
-    ENABLE_SSL="no" \
-    RUN_NET_TESTS="no"
-make
-make install
-
-cat > /usr/local/bin/hv-sa-learn << "EOF"
-#!/bin/sh
+hvbuild_post()
+{
+    cat > /usr/local/bin/hv-sa-learn << "EOF"
+#!/bin/bash
 
 SA_LEARN="/usr/bin/sa-learn"
 SA_LEARN_FLAGS="--showdots --mbox"
@@ -50,17 +40,14 @@ ${SA_LEARN} ${SA_LEARN_FLAGS} -C /etc/mail/spamassassin --ham  /var/mail/ham ||
 
 exit $?
 EOF
-chmod 755 /usr/local/bin/hv-sa-learn
+    chmod 755 /usr/local/bin/hv-sa-learn
 
-# Addition to /etc/fcron/fcrontab
-string_add "# Run SpamAssassin sa-learn every hour + 25 minutes" /etc/fcron/fcrontab
-string_add "&mail(false) 25 * * * * /usr/local/bin/mail-if-fail /usr/local/bin/hv-sa-learn" \
-    /etc/fcron/fcrontab
+    install -v -m644 ${SCRDIR}/misc/sa-learn /etc/fcron/fcron.d
 
-# Add rule to procmailrc...
+    # Add rule to procmailrc...
 
-# Put spamassassin databases in /srv
-mkdir -v -p /srv/spamassassin
-sed -i -e "s!^bayes_path.*!bayes_path /srv/spamassassin/bayes!g" /etc/mail/spamassassin/local.cf
-
-exit $?
+    # Put spamassassin databases in /srv
+    mkdir -v -p /srv/spamassassin
+    sed -i -e "s!^bayes_path.*!bayes_path /srv/spamassassin/bayes!g" \
+        /etc/mail/spamassassin/local.cf
+}